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

cmake/EthCompilerSettings.cmake

@@ -3,7 +3,7 @@
 # C++11 check and activation
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
 
-	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra -DSHAREDLIB -fPIC")
+	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra -Werror -DSHAREDLIB -fPIC")
 	set(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g -DETH_DEBUG")
 	set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG -DETH_RELEASE")
 	set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG -DETH_RELEASE")

docker/Dockerfile

@@ -8,23 +8,29 @@ RUN apt-get upgrade -y
 RUN apt-get install -qy build-essential g++-4.8 git cmake libboost-all-dev libcurl4-openssl-dev wget
 RUN apt-get install -qy automake unzip libgmp-dev libtool libleveldb-dev yasm libminiupnpc-dev libreadline-dev scons
 RUN apt-get install -qy libjsoncpp-dev libargtable2-dev
-
-# NCurses based GUI (not optional though for a succesful compilation, see https://github.com/ethereum/cpp-ethereum/issues/452 )
-RUN apt-get install -qy libncurses5-dev
-
-# Qt-based GUI
-# RUN apt-get install -qy qtbase5-dev qt5-default qtdeclarative5-dev libqt5webkit5-dev
+RUN apt-get install -qy libncurses5-dev libcurl4-openssl-dev wget
+RUN apt-get install -qy libjsoncpp-dev libargtable2-dev libmicrohttpd-dev
 
 # Ethereum PPA
 RUN apt-get install -qy software-properties-common
 RUN add-apt-repository ppa:ethereum/ethereum
+RUN add-apt-repository ppa:ethereum/ethereum-dev
 RUN apt-get update
 RUN apt-get install -qy libcryptopp-dev libjson-rpc-cpp-dev
 
+# LLVM-3.5
+RUN wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add -
+RUN echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.5 main\ndeb-src http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.5 main" > /etc/apt/sources.list.d/llvm-trusty.list
+RUN apt-get update
+RUN apt-get install -qy llvm-3.5 libedit-dev
+
+# Fix llvm-3.5 cmake paths
+RUN mkdir -p /usr/lib/llvm-3.5/share/llvm && ln -s /usr/share/llvm-3.5/cmake /usr/lib/llvm-3.5/share/llvm/cmake
+
 # Build Ethereum (HEADLESS)
 RUN git clone --depth=1 https://github.com/ethereum/cpp-ethereum
 RUN mkdir -p cpp-ethereum/build
-RUN cd cpp-ethereum/build && cmake .. -DCMAKE_BUILD_TYPE=Release -DHEADLESS=1 && make -j $(cat /proc/cpuinfo | grep processor | wc -l) && make install
+RUN cd cpp-ethereum/build && cmake .. -DHEADLESS=1 -DLLVM_DIR=/usr/share/llvm-3.5/cmake -DEVMJIT=1 && make -j $(cat /proc/cpuinfo | grep processor | wc -l) && make install
 RUN ldconfig
 
 ENTRYPOINT ["/usr/local/bin/eth"]

evmjit/libevmjit-cpp/JitVM.cpp

@@ -1,10 +1,14 @@
 
 #pragma GCC diagnostic ignored "-Wconversion"
+
 #include "JitVM.h"
+
+#include <libdevcore/Log.h>
+#include <libdevcrypto/SHA3.h>
 #include <libevm/VM.h>
 #include <libevm/VMFactory.h>
-#include <libdevcrypto/SHA3.h>
 #include <evmjit/libevmjit/ExecutionEngine.h>
+
 #include "Utils.h"
 
 namespace dev
@@ -27,12 +31,13 @@ bytesConstRef JitVM::go(ExtVMFace& _ext, OnOpFunc const& _onOp, uint64_t _step)
 
 	if (rejected)
 	{
-		UNTESTED;
-		std::cerr << "Rejected\n";
+		cwarn << "Execution rejected by EVM JIT (gas limit: " << m_gas << "), executing with interpreter";
 		VMFactory::setKind(VMKind::Interpreter);
 		m_fallbackVM = VMFactory::create(m_gas);
 		VMFactory::setKind(VMKind::JIT);
-		return m_fallbackVM->go(_ext, _onOp, _step);
+		auto&& output = m_fallbackVM->go(_ext, _onOp, _step);
+		m_gas = m_fallbackVM->gas(); // copy remaining gas, Executive expects it
+		return output;
 	}
 
 	m_data.gas 			= static_cast<decltype(m_data.gas)>(m_gas);

libethcore/BlockInfo.cpp

@@ -134,7 +134,7 @@ void BlockInfo::populate(bytesConstRef _block, bool _checkNonce)
 	RLP header = root[0];
 
 	if (!header.isList())
-		BOOST_THROW_EXCEPTION(InvalidBlockFormat(0,header.data()) << errinfo_comment("block header needs to be a list"));
+		BOOST_THROW_EXCEPTION(InvalidBlockFormat(0, header.data()) << errinfo_comment("block header needs to be a list"));
 	populateFromHeader(header, _checkNonce);
 
 	if (!root[1].isList())

libethereum/BlockChain.cpp

@@ -209,6 +209,11 @@ h256s BlockChain::import(bytes const& _block, OverlayDB const& _db)
 	try
 #endif
 	{
+		RLP blockRLP(_block);
+
+		if (!blockRLP.isList())
+			BOOST_THROW_EXCEPTION(InvalidBlockFormat(0, blockRLP.data()) << errinfo_comment("block header needs to be a list"));
+
 		bi.populate(&_block);
 		bi.verifyInternals(&_block);
 	}

libethereum/Client.cpp

@@ -257,9 +257,13 @@ LocalisedLogEntries Client::peekWatch(unsigned _watchId) const
 	Guard l(m_filterLock);
 
 	try {
+#if ETH_DEBUG
 		cdebug << "peekWatch" << _watchId;
+#endif
 		auto& w = m_watches.at(_watchId);
+#if ETH_DEBUG
 		cdebug << "lastPoll updated to " << chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
+#endif
 		w.lastPoll = chrono::system_clock::now();
 		return w.changes;
 	} catch (...) {}
@@ -273,9 +277,13 @@ LocalisedLogEntries Client::checkWatch(unsigned _watchId)
 	LocalisedLogEntries ret;
 
 	try {
+#if ETH_DEBUG
 		cdebug << "checkWatch" << _watchId;
+#endif
 		auto& w = m_watches.at(_watchId);
+#if ETH_DEBUG
 		cdebug << "lastPoll updated to " << chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
+#endif
 		std::swap(ret, w.changes);
 		w.lastPoll = chrono::system_clock::now();
 	} catch (...) {}

libethereum/Executive.cpp

@@ -176,7 +176,7 @@ OnOpFunc Executive::simpleTrace()
 		o << endl << "    STACK" << endl;
 		for (auto i: vm.stack())
 			o << (h256)i << endl;
-		o << "    MEMORY" << endl << memDump(vm.memory());
+		o << "    MEMORY" << endl << (vm.memory().size() > 1000) ? " mem size greater than 1000 bytes " : memDump(vm.memory());
 		o << "    STORAGE" << endl;
 		for (auto const& i: ext.state().storage(ext.myAddress))
 			o << showbase << hex << i.first << ": " << i.second << endl;

libethereum/Transaction.cpp

@@ -36,6 +36,9 @@ Transaction::Transaction(bytesConstRef _rlpData, CheckSignature _checkSig)
 	RLP rlp(_rlpData);
 	try
 	{
+		if (!rlp.isList())
+			BOOST_THROW_EXCEPTION(BadRLP() << errinfo_comment("transaction RLP must be a list"));
+
 		m_nonce = rlp[field = 0].toInt<u256>();
 		m_gasPrice = rlp[field = 1].toInt<u256>();
 		m_gas = rlp[field = 2].toInt<u256>();

libjsqrc/ethereumjs/.jshintrc

@@ -1,50 +1,19 @@
 {
-    "predef": [
-        "console",
-        "require",
-        "equal",
-        "test",
-        "testBoth",
-        "testWithDefault",
-        "raises",
-        "deepEqual",
-        "start",
-        "stop",
-        "ok",
-        "strictEqual",
-        "module",
-        "expect",
-        "reject",
-        "impl"
-    ],
-
-    "esnext": true,
-    "proto": true,
-    "node" : true,
-    "browser" : true,
-    "browserify" : true,
-
-    "boss" : true,
-    "curly": false,
-    "debug": true,
-    "devel": true,
+    "browserify": true,
+    "bitwise": true,
+    "camelcase": true,
     "eqeqeq": true,
-    "evil": true,
-    "forin": false,
-    "immed": false,
-    "laxbreak": false,
-    "newcap": true,
-    "noarg": true,
-    "noempty": false,
-    "nonew": false,
-    "nomen": false,
-    "onevar": false,
-    "plusplus": false,
-    "regexp": false,
+    "freeze": true,
+    "funcscope": false,
+    "maxcomplexity": 4, /* our target is 3! */
+    "maxdepth": 3,
+    "maxerr": 50,
+    /*"maxlen": 80*/ /*this should be our goal*/
+    "maxparams": 3,
+    "nonew": true,
+    "unused": true,
     "undef": true,
-    "sub": true,
-    "strict": false,
-    "white": false,
-    "shadow": true,
-    "eqnull": true
-}
+    "predef": [
+        "console"
+    ]
+}

libjsqrc/ethereumjs/README.md

@@ -1,7 +1,7 @@
 # Ethereum JavaScript API
 
 This is the Ethereum compatible [JavaScript API](https://github.com/ethereum/wiki/wiki/JavaScript-API)
-which implements the [Generic JSON RPC](https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC) spec. It's available on npm as a node module and also for bower and component as an embeddable js
+which implements the [Generic JSON RPC](https://github.com/ethereum/wiki/wiki/JSON-RPC) spec. It's available on npm as a node module and also for bower and component as an embeddable js
 
 [![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![dependency status][dep-image]][dep-url] [![dev dependency status][dep-dev-image]][dep-dev-url][![Coverage Status][coveralls-image]][coveralls-url]
 

libjsqrc/ethereumjs/bower.json

@@ -3,7 +3,10 @@
   "namespace": "ethereum",
   "version": "0.0.15",
   "description": "Ethereum Compatible JavaScript API",
-  "main": ["./dist/ethereum.js", "./dist/ethereum.min.js"],
+  "main": [
+    "./dist/ethereum.js",
+    "./dist/ethereum.min.js"
+  ],
   "dependencies": {
     "bignumber.js": ">=2.0.0"
   },

libjsqrc/ethereumjs/dist/ethereum.js

@@ -53,7 +53,6 @@ var inputTypes = types.inputTypes();
 /// @returns bytes representation of input params
 var formatInput = function (inputs, params) {
     var bytes = "";
-    var padding = c.ETH_PADDING * 2;
 
     /// first we iterate in search for dynamic 
     inputs.forEach(function (input, index) {
@@ -110,6 +109,7 @@ var formatOutput = function (outs, output) {
     output = output.slice(dynamicPartLength);
 
     outs.forEach(function (out, i) {
+        /*jshint maxcomplexity:6 */
         var typeMatch = false;
         for (var j = 0; j < outputTypes.length && !typeMatch; j++) {
             typeMatch = outputTypes[j].type(outs[i].type);
@@ -296,7 +296,6 @@ var web3 = require('./web3');
 var abi = require('./abi');
 var utils = require('./utils');
 var eventImpl = require('./event');
-var filter = require('./filter');
 
 var exportNatspecGlobals = function (vars) {
     // it's used byt natspec.js
@@ -342,6 +341,7 @@ var addFunctionsToContract = function (contract, desc, address) {
         var typeName = utils.extractTypeName(method.name);
 
         var impl = function () {
+            /*jshint maxcomplexity:7 */
             var params = Array.prototype.slice.call(arguments);
             var signature = abi.signatureFromAscii(method.name);
             var parsed = inputParser[displayName][typeName].apply(null, params);
@@ -489,7 +489,7 @@ var contract = function (address, desc) {
 module.exports = contract;
 
 
-},{"./abi":1,"./event":6,"./filter":7,"./utils":15,"./web3":17}],4:[function(require,module,exports){
+},{"./abi":1,"./event":6,"./utils":15,"./web3":17}],4:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -697,9 +697,9 @@ var getArgumentsObject = function (inputs, indexed, notIndexed) {
     return inputs.reduce(function (acc, current) {
         var value;
         if (current.indexed)
-            value = indexed.splice(0, 1)[0];
+            value = indexedCopy.splice(0, 1)[0];
         else
-            value = notIndexed.splice(0, 1)[0];
+            value = notIndexedCopy.splice(0, 1)[0];
 
         acc[current.name] = value;
         return acc;
@@ -847,7 +847,7 @@ var filter = function(options, implementation, formatter) {
         return implementation.getMessages(filterId);
     };
     
-    var uninstall = function (callback) {
+    var uninstall = function () {
         implementation.stopPolling(filterId);
         implementation.uninstallFilter(filterId);
         callbacks = [];
@@ -909,6 +909,7 @@ var padLeft = function (string, chars, sign) {
 /// If the value is floating point, round it down
 /// @returns right-aligned byte representation of int
 var formatInputInt = function (value) {
+    /*jshint maxcomplexity:7 */
     var padding = c.ETH_PADDING * 2;
     if (value instanceof BigNumber || typeof value === 'number') {
         if (typeof value === 'number')
@@ -1210,6 +1211,7 @@ var c = require('./const');
  */
 var requestManager = function() {
     var polls = [];
+    var timeout = null;
     var provider;
 
     var send = function (data) {
@@ -1234,9 +1236,11 @@ var requestManager = function() {
         provider = p;
     };
 
+    /*jshint maxparams:4 */
     var startPolling = function (data, pollId, callback, uninstall) {
         polls.push({data: data, id: pollId, callback: callback, uninstall: uninstall});
     };
+    /*jshint maxparams:3 */
 
     var stopPolling = function (pollId) {
         for (var i = polls.length; i--;) {
@@ -1252,6 +1256,12 @@ var requestManager = function() {
             poll.uninstall(poll.id); 
         });
         polls = [];
+
+        if (timeout) {
+            clearTimeout(timeout);
+            timeout = null;
+        }
+        poll();
     };
 
     var poll = function () {
@@ -1262,7 +1272,7 @@ var requestManager = function() {
             }
             data.callback(result);
         });
-        setTimeout(poll, c.ETH_POLLING_TIMEOUT);
+        timeout = setTimeout(poll, c.ETH_POLLING_TIMEOUT);
     };
     
     poll();
@@ -1509,6 +1519,7 @@ var filterEvents = function (json) {
 /// TODO: use BigNumber.js to parse int
 /// TODO: add tests for it!
 var toEth = function (str) {
+     /*jshint maxcomplexity:7 */
     var val = typeof str === "string" ? str.indexOf('0x') === 0 ? parseInt(str.substr(2), 16) : parseInt(str) : str;
     var unit = 0;
     var units = c.ETH_UNITS;
@@ -1677,12 +1688,14 @@ var setupProperties = function (obj, properties) {
     });
 };
 
+/*jshint maxparams:4 */
 var startPolling = function (method, id, callback, uninstall) {
     web3.manager.startPolling({
         method: method, 
         params: [id]
     }, id,  callback, uninstall); 
 };
+/*jshint maxparams:3 */
 
 var stopPolling = function (id) {
     web3.manager.stopPolling(id);
@@ -1740,12 +1753,14 @@ var web3 = {
         /// @param indexed is optional, this is an object with optional event indexed params
         /// @param options is optional, this is an object with optional event options ('max'...)
         /// TODO: fix it, 4 params? no way
+        /*jshint maxparams:4 */
         watch: function (fil, indexed, options, formatter) {
             if (fil._isEvent) {
                 return fil(indexed, options);
             }
             return filter(fil, ethWatch, formatter);
         }
+        /*jshint maxparams:3 */
     },
 
     /// db object prototype

libjsqrc/ethereumjs/gulpfile.js

@@ -10,8 +10,6 @@ var browserify = require('browserify');
 var jshint = require('gulp-jshint');
 var uglify = require('gulp-uglify');
 var rename = require('gulp-rename');
-var envify = require('envify/custom');
-var unreach = require('unreachable-branch-transform');
 var source = require('vinyl-source-stream');
 var exorcist = require('exorcist');
 var bower = require('bower');
@@ -23,7 +21,7 @@ var dst = 'ethereum';
 
 var browserifyOptions = {
     debug: true,
-    insert_global_vars: false,
+    insert_global_vars: false, // jshint ignore:line
     detectGlobals: false,
     bundleExternal: false
 };

libjsqrc/ethereumjs/lib/abi.js

@@ -52,7 +52,6 @@ var inputTypes = types.inputTypes();
 /// @returns bytes representation of input params
 var formatInput = function (inputs, params) {
     var bytes = "";
-    var padding = c.ETH_PADDING * 2;
 
     /// first we iterate in search for dynamic 
     inputs.forEach(function (input, index) {
@@ -109,6 +108,7 @@ var formatOutput = function (outs, output) {
     output = output.slice(dynamicPartLength);
 
     outs.forEach(function (out, i) {
+        /*jshint maxcomplexity:6 */
         var typeMatch = false;
         for (var j = 0; j < outputTypes.length && !typeMatch; j++) {
             typeMatch = outputTypes[j].type(outs[i].type);

libjsqrc/ethereumjs/lib/contract.js

@@ -24,7 +24,6 @@ var web3 = require('./web3');
 var abi = require('./abi');
 var utils = require('./utils');
 var eventImpl = require('./event');
-var filter = require('./filter');
 
 var exportNatspecGlobals = function (vars) {
     // it's used byt natspec.js
@@ -70,6 +69,7 @@ var addFunctionsToContract = function (contract, desc, address) {
         var typeName = utils.extractTypeName(method.name);
 
         var impl = function () {
+            /*jshint maxcomplexity:7 */
             var params = Array.prototype.slice.call(arguments);
             var signature = abi.signatureFromAscii(method.name);
             var parsed = inputParser[displayName][typeName].apply(null, params);

libjsqrc/ethereumjs/lib/event.js

@@ -81,9 +81,9 @@ var getArgumentsObject = function (inputs, indexed, notIndexed) {
     return inputs.reduce(function (acc, current) {
         var value;
         if (current.indexed)
-            value = indexed.splice(0, 1)[0];
+            value = indexedCopy.splice(0, 1)[0];
         else
-            value = notIndexed.splice(0, 1)[0];
+            value = notIndexedCopy.splice(0, 1)[0];
 
         acc[current.name] = value;
         return acc;

libjsqrc/ethereumjs/lib/filter.js

@@ -93,7 +93,7 @@ var filter = function(options, implementation, formatter) {
         return implementation.getMessages(filterId);
     };
     
-    var uninstall = function (callback) {
+    var uninstall = function () {
         implementation.stopPolling(filterId);
         implementation.uninstallFilter(filterId);
         callbacks = [];

libjsqrc/ethereumjs/lib/formatters.js

@@ -40,6 +40,7 @@ var padLeft = function (string, chars, sign) {
 /// If the value is floating point, round it down
 /// @returns right-aligned byte representation of int
 var formatInputInt = function (value) {
+    /*jshint maxcomplexity:7 */
     var padding = c.ETH_PADDING * 2;
     if (value instanceof BigNumber || typeof value === 'number') {
         if (typeof value === 'number')

libjsqrc/ethereumjs/lib/requestmanager.js

@@ -33,6 +33,7 @@ var c = require('./const');
  */
 var requestManager = function() {
     var polls = [];
+    var timeout = null;
     var provider;
 
     var send = function (data) {
@@ -57,9 +58,11 @@ var requestManager = function() {
         provider = p;
     };
 
+    /*jshint maxparams:4 */
     var startPolling = function (data, pollId, callback, uninstall) {
         polls.push({data: data, id: pollId, callback: callback, uninstall: uninstall});
     };
+    /*jshint maxparams:3 */
 
     var stopPolling = function (pollId) {
         for (var i = polls.length; i--;) {
@@ -75,6 +78,12 @@ var requestManager = function() {
             poll.uninstall(poll.id); 
         });
         polls = [];
+
+        if (timeout) {
+            clearTimeout(timeout);
+            timeout = null;
+        }
+        poll();
     };
 
     var poll = function () {
@@ -85,7 +94,7 @@ var requestManager = function() {
             }
             data.callback(result);
         });
-        setTimeout(poll, c.ETH_POLLING_TIMEOUT);
+        timeout = setTimeout(poll, c.ETH_POLLING_TIMEOUT);
     };
     
     poll();

libjsqrc/ethereumjs/lib/utils.js

@@ -107,6 +107,7 @@ var filterEvents = function (json) {
 /// TODO: use BigNumber.js to parse int
 /// TODO: add tests for it!
 var toEth = function (str) {
+     /*jshint maxcomplexity:7 */
     var val = typeof str === "string" ? str.indexOf('0x') === 0 ? parseInt(str.substr(2), 16) : parseInt(str) : str;
     var unit = 0;
     var units = c.ETH_UNITS;

libjsqrc/ethereumjs/lib/web3.js

@@ -80,12 +80,14 @@ var setupProperties = function (obj, properties) {
     });
 };
 
+/*jshint maxparams:4 */
 var startPolling = function (method, id, callback, uninstall) {
     web3.manager.startPolling({
         method: method, 
         params: [id]
     }, id,  callback, uninstall); 
 };
+/*jshint maxparams:3 */
 
 var stopPolling = function (id) {
     web3.manager.stopPolling(id);
@@ -143,12 +145,14 @@ var web3 = {
         /// @param indexed is optional, this is an object with optional event indexed params
         /// @param options is optional, this is an object with optional event options ('max'...)
         /// TODO: fix it, 4 params? no way
+        /*jshint maxparams:4 */
         watch: function (fil, indexed, options, formatter) {
             if (fil._isEvent) {
                 return fil(indexed, options);
             }
             return filter(fil, ethWatch, formatter);
         }
+        /*jshint maxparams:3 */
     },
 
     /// db object prototype

libjsqrc/ethereumjs/package.json

@@ -9,7 +9,6 @@
   },
   "dependencies": {
     "bignumber.js": ">=2.0.0",
-    "ws": "*",
     "xmlhttprequest": "*"
   },
   "devDependencies": {

libsolidity/AST.cpp

@@ -209,6 +209,33 @@ vector<pair<FixedHash<4>, FunctionTypePointer>> const& ContractDefinition::getIn
 	return *m_interfaceFunctionList;
 }
 
+vector<Declaration const*> const& ContractDefinition::getInheritableMembers() const
+{
+	if (!m_inheritableMembers)
+	{
+		set<string> memberSeen;
+		m_inheritableMembers.reset(new vector<Declaration const*>());
+		auto addInheritableMember = [&](Declaration const* _decl)
+		{
+			if (memberSeen.count(_decl->getName()) == 0 && _decl->isVisibleInDerivedContracts())
+			{
+				memberSeen.insert(_decl->getName());
+				m_inheritableMembers->push_back(_decl);
+			}
+		};
+
+		for (ASTPointer<FunctionDefinition> const& f: getDefinedFunctions())
+			addInheritableMember(f.get());
+
+		for (ASTPointer<VariableDeclaration> const& v: getStateVariables())
+			addInheritableMember(v.get());
+
+		for (ASTPointer<StructDefinition> const& s: getDefinedStructs())
+			addInheritableMember(s.get());
+	}
+	return *m_inheritableMembers;
+}
+
 TypePointer EnumValue::getType(ContractDefinition const*) const
 {
 	EnumDefinition const* parentDef = dynamic_cast<EnumDefinition const*>(getScope());
@@ -281,7 +308,9 @@ void FunctionDefinition::checkTypeRequirements()
 		if (!var->getType()->canLiveOutsideStorage())
 			BOOST_THROW_EXCEPTION(var->createTypeError("Type is required to live outside storage."));
 	for (ASTPointer<ModifierInvocation> const& modifier: m_functionModifiers)
-		modifier->checkTypeRequirements();
+		modifier->checkTypeRequirements(isConstructor() ?
+			dynamic_cast<ContractDefinition const&>(*getScope()).getBaseContracts() :
+			vector<ASTPointer<InheritanceSpecifier>>());
 
 	m_body->checkTypeRequirements();
 }
@@ -324,19 +353,34 @@ void ModifierDefinition::checkTypeRequirements()
 	m_body->checkTypeRequirements();
 }
 
-void ModifierInvocation::checkTypeRequirements()
+void ModifierInvocation::checkTypeRequirements(vector<ASTPointer<InheritanceSpecifier>> const& _bases)
 {
 	m_modifierName->checkTypeRequirements();
 	for (ASTPointer<Expression> const& argument: m_arguments)
 		argument->checkTypeRequirements();
 
-	ModifierDefinition const* modifier = dynamic_cast<ModifierDefinition const*>(m_modifierName->getReferencedDeclaration());
-	solAssert(modifier, "Function modifier not found.");
-	vector<ASTPointer<VariableDeclaration>> const& parameters = modifier->getParameters();
-	if (parameters.size() != m_arguments.size())
+	auto declaration = m_modifierName->getReferencedDeclaration();
+	vector<ASTPointer<VariableDeclaration>> emptyParameterList;
+	vector<ASTPointer<VariableDeclaration>> const* parameters = nullptr;
+	if (auto modifier = dynamic_cast<ModifierDefinition const*>(declaration))
+		parameters = &modifier->getParameters();
+	else
+		// check parameters for Base constructors
+		for (auto const& base: _bases)
+			if (declaration == base->getName()->getReferencedDeclaration())
+			{
+				if (auto referencedConstructor = dynamic_cast<ContractDefinition const&>(*declaration).getConstructor())
+					parameters = &referencedConstructor->getParameters();
+				else
+					parameters = &emptyParameterList;
+				break;
+			}
+	if (!parameters)
+		BOOST_THROW_EXCEPTION(createTypeError("Referenced declaration is neither modifier nor base class."));
+	if (parameters->size() != m_arguments.size())
 		BOOST_THROW_EXCEPTION(createTypeError("Wrong argument count for modifier invocation."));
 	for (size_t i = 0; i < m_arguments.size(); ++i)
-		if (!m_arguments[i]->getType()->isImplicitlyConvertibleTo(*parameters[i]->getType()))
+		if (!m_arguments[i]->getType()->isImplicitlyConvertibleTo(*(*parameters)[i]->getType()))
 			BOOST_THROW_EXCEPTION(createTypeError("Invalid type for argument in modifier invocation."));
 }
 

libsolidity/AST.h

@@ -144,7 +144,7 @@ public:
 	Visibility getVisibility() const { return m_visibility == Visibility::Default ? getDefaultVisibility() : m_visibility; }
 	bool isPublic() const { return getVisibility() >= Visibility::Public; }
 	bool isVisibleInContract() const { return getVisibility() != Visibility::External; }
-	bool isVisibleInDerivedContracts() const { return isVisibleInContract() && getVisibility() >= Visibility::Internal; }
+	virtual bool isVisibleInDerivedContracts() const { return isVisibleInContract() && getVisibility() >= Visibility::Internal; }
 
 	/// @returns the scope this declaration resides in. Can be nullptr if it is the global scope.
 	/// Available only after name and type resolution step.
@@ -247,6 +247,9 @@ public:
 	/// as intended for use by the ABI.
 	std::map<FixedHash<4>, FunctionTypePointer> getInterfaceFunctions() const;
 
+	/// @returns a list of the inheritable members of this contract
+	std::vector<Declaration const*> const& getInheritableMembers() const;
+
 	/// List of all (direct and indirect) base contracts in order from derived to base, including
 	/// the contract itself. Available after name resolution
 	std::vector<ContractDefinition const*> const& getLinearizedBaseContracts() const { return m_linearizedBaseContracts; }
@@ -273,6 +276,7 @@ private:
 	std::vector<ContractDefinition const*> m_linearizedBaseContracts;
 	mutable std::unique_ptr<std::vector<std::pair<FixedHash<4>, FunctionTypePointer>>> m_interfaceFunctionList;
 	mutable std::unique_ptr<std::vector<ASTPointer<EventDefinition>>> m_interfaceEvents;
+	mutable std::unique_ptr<std::vector<Declaration const*>> m_inheritableMembers;
 };
 
 class InheritanceSpecifier: public ASTNode
@@ -405,6 +409,11 @@ public:
 	ASTPointer<ParameterList> const& getReturnParameterList() const { return m_returnParameters; }
 	Block const& getBody() const { return *m_body; }
 
+	virtual bool isVisibleInDerivedContracts() const override
+	{
+		return !isConstructor() && !getName().empty() && isVisibleInContract() &&
+			getVisibility() >= Visibility::Internal;
+	}
 	virtual TypePointer getType(ContractDefinition const*) const override;
 
 	/// Checks that all parameters have allowed types and calls checkTypeRequirements on the body.
@@ -501,7 +510,7 @@ private:
 };
 
 /**
- * Invocation/usage of a modifier in a function header.
+ * Invocation/usage of a modifier in a function header or a base constructor call.
  */
 class ModifierInvocation: public ASTNode
 {
@@ -516,7 +525,8 @@ public:
 	ASTPointer<Identifier> const& getName() const { return m_modifierName; }
 	std::vector<ASTPointer<Expression>> const& getArguments() const { return m_arguments; }
 
-	void checkTypeRequirements();
+	/// @param _bases is the list of base contracts for base constructor calls. For modifiers an empty vector should be passed.
+	void checkTypeRequirements(std::vector<ASTPointer<InheritanceSpecifier>> const& _bases);
 
 private:
 	ASTPointer<Identifier> m_modifierName;

libsolidity/ArrayUtils.cpp

@@ -0,0 +1,304 @@
+/*
+	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/>.
+*/
+/**
+ * @author Christian <c@ethdev.com>
+ * @date 2015
+ * Code generation utils that handle arrays.
+ */
+
+#include <libsolidity/ArrayUtils.h>
+#include <libevmcore/Instruction.h>
+#include <libsolidity/CompilerContext.h>
+#include <libsolidity/CompilerUtils.h>
+#include <libsolidity/Types.h>
+#include <libsolidity/Utils.h>
+#include <libsolidity/LValue.h>
+
+using namespace std;
+using namespace dev;
+using namespace solidity;
+
+void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType const& _sourceType) const
+{
+	// stack layout: [source_ref] target_ref (top)
+	// need to leave target_ref on the stack at the end
+	solAssert(_targetType.getLocation() == ArrayType::Location::Storage, "");
+
+	IntegerType uint256(256);
+	Type const* targetBaseType = _targetType.isByteArray() ? &uint256 : &(*_targetType.getBaseType());
+	Type const* sourceBaseType = _sourceType.isByteArray() ? &uint256 : &(*_sourceType.getBaseType());
+
+	switch (_sourceType.getLocation())
+	{
+	case ArrayType::Location::CallData:
+	{
+		solAssert(_targetType.isByteArray(), "Non byte arrays not yet implemented here.");
+		solAssert(_sourceType.isByteArray(), "Non byte arrays not yet implemented here.");
+		// This also assumes that after "length" we only have zeros, i.e. it cannot be used to
+		// slice a byte array from calldata.
+
+		// stack: source_offset source_len target_ref
+		// fetch old length and convert to words
+		m_context << eth::Instruction::DUP1 << eth::Instruction::SLOAD;
+		convertLengthToSize(_targetType);
+		// stack here: source_offset source_len target_ref target_length_words
+		// actual array data is stored at SHA3(storage_offset)
+		m_context << eth::Instruction::DUP2;
+		CompilerUtils(m_context).computeHashStatic();
+		// compute target_data_end
+		m_context << eth::Instruction::DUP1 << eth::Instruction::SWAP2 << eth::Instruction::ADD
+				  << eth::Instruction::SWAP1;
+		// stack here: source_offset source_len target_ref target_data_end target_data_ref
+		// store length (in bytes)
+		m_context << eth::Instruction::DUP4 << eth::Instruction::DUP1 << eth::Instruction::DUP5
+			<< eth::Instruction::SSTORE;
+		// jump to end if length is zero
+		m_context << eth::Instruction::ISZERO;
+		eth::AssemblyItem copyLoopEnd = m_context.newTag();
+		m_context.appendConditionalJumpTo(copyLoopEnd);
+		// store start offset
+		m_context << eth::Instruction::DUP5;
+		// stack now: source_offset source_len target_ref target_data_end target_data_ref calldata_offset
+		eth::AssemblyItem copyLoopStart = m_context.newTag();
+		m_context << copyLoopStart
+				  // copy from calldata and store
+				  << eth::Instruction::DUP1 << eth::Instruction::CALLDATALOAD
+				  << eth::Instruction::DUP3 << eth::Instruction::SSTORE
+				  // increment target_data_ref by 1
+				  << eth::Instruction::SWAP1 << u256(1) << eth::Instruction::ADD
+				  // increment calldata_offset by 32
+				  << eth::Instruction::SWAP1 << u256(32) << eth::Instruction::ADD
+				  // check for loop condition
+				  << eth::Instruction::DUP1 << eth::Instruction::DUP6 << eth::Instruction::GT;
+		m_context.appendConditionalJumpTo(copyLoopStart);
+		m_context << eth::Instruction::POP;
+		m_context << copyLoopEnd;
+
+		// now clear leftover bytes of the old value
+		// stack now: source_offset source_len target_ref target_data_end target_data_ref
+		clearStorageLoop(IntegerType(256));
+		// stack now: source_offset source_len target_ref target_data_end
+
+		m_context << eth::Instruction::POP << eth::Instruction::SWAP2
+			<< eth::Instruction::POP << eth::Instruction::POP;
+		break;
+	}
+	case ArrayType::Location::Storage:
+	{
+		// this copies source to target and also clears target if it was larger
+
+		solAssert(sourceBaseType->getStorageSize() == targetBaseType->getStorageSize(),
+			"Copying with different storage sizes not yet implemented.");
+		// stack: source_ref target_ref
+		// store target_ref
+		m_context << eth::Instruction::SWAP1 << eth::Instruction::DUP2;
+		// stack: target_ref source_ref target_ref
+		// fetch lengthes
+		retrieveLength(_targetType);
+		m_context << eth::Instruction::SWAP2;
+		// stack: target_ref target_len target_ref source_ref
+		retrieveLength(_sourceType);
+		// stack: target_ref target_len target_ref source_ref source_len
+		if (_targetType.isDynamicallySized())
+			// store new target length
+			m_context << eth::Instruction::DUP1 << eth::Instruction::DUP4 << eth::Instruction::SSTORE;
+		// compute hashes (data positions)
+		m_context << eth::Instruction::SWAP2;
+		if (_targetType.isDynamicallySized())
+			CompilerUtils(m_context).computeHashStatic();
+		m_context << eth::Instruction::SWAP1;
+		if (_sourceType.isDynamicallySized())
+			CompilerUtils(m_context).computeHashStatic();
+		// stack: target_ref target_len source_len target_data_pos source_data_pos
+		m_context << eth::Instruction::DUP4;
+		convertLengthToSize(_sourceType);
+		m_context << eth::Instruction::DUP4;
+		convertLengthToSize(_sourceType);
+		// stack: target_ref target_len source_len target_data_pos source_data_pos target_size source_size
+		// @todo we might be able to go without a third counter
+		m_context << u256(0);
+		// stack: target_ref target_len source_len target_data_pos source_data_pos target_size source_size counter
+		eth::AssemblyItem copyLoopStart = m_context.newTag();
+		m_context << copyLoopStart;
+		// check for loop condition
+		m_context << eth::Instruction::DUP1 << eth::Instruction::DUP3
+				   << eth::Instruction::GT << eth::Instruction::ISZERO;
+		eth::AssemblyItem copyLoopEnd = m_context.newTag();
+		m_context.appendConditionalJumpTo(copyLoopEnd);
+		// copy
+		m_context << eth::Instruction::DUP4 << eth::Instruction::DUP2 << eth::Instruction::ADD;
+		StorageItem(m_context, *sourceBaseType).retrieveValue(SourceLocation(), true);
+		m_context << eth::dupInstruction(5 + sourceBaseType->getSizeOnStack())
+			<< eth::dupInstruction(2 + sourceBaseType->getSizeOnStack()) << eth::Instruction::ADD;
+		StorageItem(m_context, *targetBaseType).storeValue(*sourceBaseType, SourceLocation(), true);
+		// increment
+		m_context << targetBaseType->getStorageSize() << eth::Instruction::ADD;
+		m_context.appendJumpTo(copyLoopStart);
+		m_context << copyLoopEnd;
+
+		// zero-out leftovers in target
+		// stack: target_ref target_len source_len target_data_pos source_data_pos target_size source_size counter
+		// add counter to target_data_pos
+		m_context << eth::Instruction::DUP5 << eth::Instruction::ADD
+				  << eth::Instruction::SWAP5 << eth::Instruction::POP;
+		// stack: target_ref target_len target_data_pos_updated target_data_pos source_data_pos target_size source_size
+		// add size to target_data_pos to get target_data_end
+		m_context << eth::Instruction::POP << eth::Instruction::DUP3 << eth::Instruction::ADD
+				  << eth::Instruction::SWAP4
+				  << eth::Instruction::POP  << eth::Instruction::POP << eth::Instruction::POP;
+		// stack: target_ref target_data_end target_data_pos_updated
+		clearStorageLoop(*targetBaseType);
+		m_context << eth::Instruction::POP;
+		break;
+	}
+	default:
+		solAssert(false, "Given byte array location not implemented.");
+	}
+}
+
+void ArrayUtils::clearArray(ArrayType const& _type) const
+{
+	solAssert(_type.getLocation() == ArrayType::Location::Storage, "");
+	if (_type.isDynamicallySized())
+		clearDynamicArray(_type);
+	else if (_type.getLength() == 0)
+		m_context << eth::Instruction::POP;
+	else if (_type.getLength() < 5) // unroll loop for small arrays @todo choose a good value
+	{
+		for (unsigned i = 1; i < _type.getLength(); ++i)
+		{
+			StorageItem(m_context, *_type.getBaseType()).setToZero(SourceLocation(), false);
+			m_context << u256(_type.getBaseType()->getStorageSize()) << eth::Instruction::ADD;
+		}
+		StorageItem(m_context, *_type.getBaseType()).setToZero(SourceLocation(), true);
+	}
+	else
+	{
+		m_context
+			<< eth::Instruction::DUP1 << u256(_type.getLength())
+			<< u256(_type.getBaseType()->getStorageSize())
+			<< eth::Instruction::MUL << eth::Instruction::ADD << eth::Instruction::SWAP1;
+		clearStorageLoop(*_type.getBaseType());
+		m_context << eth::Instruction::POP;
+	}
+}
+
+void ArrayUtils::clearDynamicArray(ArrayType const& _type) const
+{
+	solAssert(_type.getLocation() == ArrayType::Location::Storage, "");
+	solAssert(_type.isDynamicallySized(), "");
+
+	// fetch length
+	m_context << eth::Instruction::DUP1 << eth::Instruction::SLOAD;
+	// set length to zero
+	m_context << u256(0) << eth::Instruction::DUP3 << eth::Instruction::SSTORE;
+	// stack: ref old_length
+	convertLengthToSize(_type);
+	// compute data positions
+	m_context << eth::Instruction::SWAP1;
+	CompilerUtils(m_context).computeHashStatic();
+	// stack: len data_pos (len is in slots for byte array and in items for other arrays)
+	m_context << eth::Instruction::SWAP1 << eth::Instruction::DUP2 << eth::Instruction::ADD
+		<< eth::Instruction::SWAP1;
+	// stack: data_pos_end data_pos
+	if (_type.isByteArray())
+		clearStorageLoop(IntegerType(256));
+	else
+		clearStorageLoop(*_type.getBaseType());
+	// cleanup
+	m_context << eth::Instruction::POP;
+}
+
+void ArrayUtils::resizeDynamicArray(const ArrayType& _type) const
+{
+	solAssert(_type.getLocation() == ArrayType::Location::Storage, "");
+	solAssert(_type.isDynamicallySized(), "");
+
+	eth::AssemblyItem resizeEnd = m_context.newTag();
+
+	// stack: ref new_length
+	// fetch old length
+	m_context << eth::Instruction::DUP2 << eth::Instruction::SLOAD;
+	// stack: ref new_length old_length
+	// store new length
+	m_context << eth::Instruction::DUP2 << eth::Instruction::DUP4 << eth::Instruction::SSTORE;
+	// skip if size is not reduced
+	m_context << eth::Instruction::DUP2 << eth::Instruction::DUP2
+		<< eth::Instruction::ISZERO << eth::Instruction::GT;
+	m_context.appendConditionalJumpTo(resizeEnd);
+
+	// size reduced, clear the end of the array
+	// stack: ref new_length old_length
+	convertLengthToSize(_type);
+	m_context << eth::Instruction::DUP2;
+	convertLengthToSize(_type);
+	// stack: ref new_length old_size new_size
+	// compute data positions
+	m_context << eth::Instruction::DUP4;
+	CompilerUtils(m_context).computeHashStatic();
+	// stack: ref new_length old_size new_size data_pos
+	m_context << eth::Instruction::SWAP2 << eth::Instruction::DUP3 << eth::Instruction::ADD;
+	// stack: ref new_length data_pos new_size delete_end
+	m_context << eth::Instruction::SWAP2 << eth::Instruction::ADD;
+	// stack: ref new_length delete_end delete_start
+	if (_type.isByteArray())
+		clearStorageLoop(IntegerType(256));
+	else
+		clearStorageLoop(*_type.getBaseType());
+
+	m_context << resizeEnd;
+	// cleanup
+	m_context << eth::Instruction::POP << eth::Instruction::POP << eth::Instruction::POP;
+}
+
+void ArrayUtils::clearStorageLoop(Type const& _type) const
+{
+	// stack: end_pos pos
+	eth::AssemblyItem loopStart = m_context.newTag();
+	m_context << loopStart;
+	// check for loop condition
+	m_context << eth::Instruction::DUP1 << eth::Instruction::DUP3
+			   << eth::Instruction::GT << eth::Instruction::ISZERO;
+	eth::AssemblyItem zeroLoopEnd = m_context.newTag();
+	m_context.appendConditionalJumpTo(zeroLoopEnd);
+	// delete
+	StorageItem(m_context, _type).setToZero(SourceLocation(), false);
+	// increment
+	m_context << u256(1) << eth::Instruction::ADD;
+	m_context.appendJumpTo(loopStart);
+	// cleanup
+	m_context << zeroLoopEnd;
+	m_context << eth::Instruction::POP;
+}
+
+void ArrayUtils::convertLengthToSize(ArrayType const& _arrayType) const
+{
+	if (_arrayType.isByteArray())
+		m_context << u256(31) << eth::Instruction::ADD
+			<< u256(32) << eth::Instruction::SWAP1 << eth::Instruction::DIV;
+	else if (_arrayType.getBaseType()->getStorageSize() > 1)
+		m_context << _arrayType.getBaseType()->getStorageSize() << eth::Instruction::MUL;
+}
+
+void ArrayUtils::retrieveLength(ArrayType const& _arrayType) const
+{
+	if (_arrayType.isDynamicallySized())
+		m_context << eth::Instruction::DUP1 << eth::Instruction::SLOAD;
+	else
+		m_context << _arrayType.getLength();
+}
+

libsolidity/ArrayUtils.h

@@ -0,0 +1,78 @@
+/*
+	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/>.
+*/
+/**
+ * @author Christian <c@ethdev.com>
+ * @date 2015
+ * Code generation utils that handle arrays.
+ */
+
+#pragma once
+
+namespace dev
+{
+namespace solidity
+{
+
+class CompilerContext;
+class Type;
+class ArrayType;
+
+/**
+ * Class that provides code generation for handling arrays.
+ */
+class ArrayUtils
+{
+public:
+	ArrayUtils(CompilerContext& _context): m_context(_context) {}
+
+	/// Copies an array to an array in storage. The arrays can be of different types only if
+	/// their storage representation is the same.
+	/// Stack pre: [source_reference] target_reference
+	/// Stack post: target_reference
+	void copyArrayToStorage(ArrayType const& _targetType, ArrayType const& _sourceType) const;
+	/// Clears the given dynamic or static array.
+	/// Stack pre: reference
+	/// Stack post:
+	void clearArray(ArrayType const& _type) const;
+	/// Clears the length and data elements of the array referenced on the stack.
+	/// Stack pre: reference
+	/// Stack post:
+	void clearDynamicArray(ArrayType const& _type) const;
+	/// Changes the size of a dynamic array and clears the tail if it is shortened.
+	/// Stack pre: reference new_length
+	/// Stack post:
+	void resizeDynamicArray(ArrayType const& _type) const;
+	/// Appends a loop that clears a sequence of storage slots of the given type (excluding end).
+	/// Stack pre: end_ref start_ref
+	/// Stack post: end_ref
+	void clearStorageLoop(Type const& _type) const;
+	/// Converts length to size (multiplies by size on stack), rounds up for byte arrays.
+	/// Stack pre: length
+	/// Stack post: size
+	void convertLengthToSize(ArrayType const& _arrayType) const;
+	/// Retrieves the length (number of elements) of the array ref on the stack. This also
+	/// works for statically-sized arrays.
+	/// Stack pre: reference
+	/// Stack post: reference length
+	void retrieveLength(ArrayType const& _arrayType) const;
+
+private:
+	CompilerContext& m_context;
+};
+
+}
+}

libsolidity/Compiler.cpp

@@ -58,7 +58,10 @@ void Compiler::compileContract(ContractDefinition const& _contract,
 	while (!functions.empty())
 	{
 		for (Declaration const* function: functions)
+		{
+			m_context.setStackOffset(0);
 			function->accept(*this);
+		}
 		functions = m_context.getFunctionsWithoutCode();
 	}
 
@@ -79,37 +82,38 @@ void Compiler::initializeContext(ContractDefinition const& _contract,
 
 void Compiler::packIntoContractCreator(ContractDefinition const& _contract, CompilerContext const& _runtimeContext)
 {
-	// arguments for base constructors, filled in derived-to-base order
-	map<ContractDefinition const*, vector<ASTPointer<Expression>> const*> baseArguments;
-
 	// Determine the arguments that are used for the base constructors.
 	std::vector<ContractDefinition const*> const& bases = _contract.getLinearizedBaseContracts();
 	for (ContractDefinition const* contract: bases)
+	{
+		if (FunctionDefinition const* constructor = contract->getConstructor())
+			for (auto const& modifier: constructor->getModifiers())
+			{
+				auto baseContract = dynamic_cast<ContractDefinition const*>(
+					modifier->getName()->getReferencedDeclaration());
+				if (baseContract)
+					if (m_baseArguments.count(baseContract->getConstructor()) == 0)
+						m_baseArguments[baseContract->getConstructor()] = &modifier->getArguments();
+			}
+
 		for (ASTPointer<InheritanceSpecifier> const& base: contract->getBaseContracts())
 		{
 			ContractDefinition const* baseContract = dynamic_cast<ContractDefinition const*>(
 						base->getName()->getReferencedDeclaration());
 			solAssert(baseContract, "");
-			if (baseArguments.count(baseContract) == 0)
-				baseArguments[baseContract] = &base->getArguments();
-		}
 
-	// Call constructors in base-to-derived order.
-	// The Constructor for the most derived contract is called later.
-	for (unsigned i = 1; i < bases.size(); i++)
-	{
-		ContractDefinition const* base = bases[bases.size() - i];
-		solAssert(base, "");
-		initializeStateVariables(*base);
-		FunctionDefinition const* baseConstructor = base->getConstructor();
-		if (!baseConstructor)
-			continue;
-		solAssert(baseArguments[base], "");
-		appendBaseConstructorCall(*baseConstructor, *baseArguments[base]);
+			if (m_baseArguments.count(baseContract->getConstructor()) == 0)
+				m_baseArguments[baseContract->getConstructor()] = &base->getArguments();
+		}
 	}
-	initializeStateVariables(_contract);
-	if (_contract.getConstructor())
-		appendConstructorCall(*_contract.getConstructor());
+	// Initialization of state variables in base-to-derived order.
+	for (ContractDefinition const* contract: boost::adaptors::reverse(bases))
+		initializeStateVariables(*contract);
+
+	if (FunctionDefinition const* constructor = _contract.getConstructor())
+		appendConstructor(*constructor);
+	else if (auto c = m_context.getNextConstructor(_contract))
+		appendBaseConstructor(*c);
 
 	eth::AssemblyItem sub = m_context.addSubroutine(_runtimeContext.getAssembly());
 	// stack contains sub size
@@ -126,22 +130,23 @@ void Compiler::packIntoContractCreator(ContractDefinition const& _contract, Comp
 	}
 }
 
-void Compiler::appendBaseConstructorCall(FunctionDefinition const& _constructor,
-										 vector<ASTPointer<Expression>> const& _arguments)
+void Compiler::appendBaseConstructor(FunctionDefinition const& _constructor)
 {
 	CompilerContext::LocationSetter locationSetter(m_context, &_constructor);
 	FunctionType constructorType(_constructor);
-	eth::AssemblyItem returnLabel = m_context.pushNewTag();
-	for (unsigned i = 0; i < _arguments.size(); ++i)
-		compileExpression(*_arguments[i], constructorType.getParameterTypes()[i]);
-	m_context.appendJumpTo(m_context.getFunctionEntryLabel(_constructor));
-	m_context << returnLabel;
+	if (!constructorType.getParameterTypes().empty())
+	{
+		std::vector<ASTPointer<Expression>> const* arguments = m_baseArguments[&_constructor];
+		solAssert(arguments, "");
+		for (unsigned i = 0; i < arguments->size(); ++i)
+			compileExpression(*(arguments->at(i)), constructorType.getParameterTypes()[i]);
+	}
+	_constructor.accept(*this);
 }
 
-void Compiler::appendConstructorCall(FunctionDefinition const& _constructor)
+void Compiler::appendConstructor(FunctionDefinition const& _constructor)
 {
 	CompilerContext::LocationSetter locationSetter(m_context, &_constructor);
-	eth::AssemblyItem returnTag = m_context.pushNewTag();
 	// copy constructor arguments from code to memory and then to stack, they are supplied after the actual program
 	unsigned argumentSize = 0;
 	for (ASTPointer<VariableDeclaration> const& var: _constructor.getParameters())
@@ -155,8 +160,7 @@ void Compiler::appendConstructorCall(FunctionDefinition const& _constructor)
 		m_context << eth::Instruction::CODECOPY;
 		appendCalldataUnpacker(FunctionType(_constructor).getParameterTypes(), true);
 	}
-	m_context.appendJumpTo(m_context.getFunctionEntryLabel(_constructor));
-	m_context << returnTag;
+	_constructor.accept(*this);
 }
 
 void Compiler::appendFunctionSelector(ContractDefinition const& _contract)
@@ -296,28 +300,36 @@ bool Compiler::visit(FunctionDefinition const& _function)
 	// although note that this reduces the size of the visible stack
 
 	m_context.startFunction(_function);
-	m_returnTag = m_context.newTag();
-	m_breakTags.clear();
-	m_continueTags.clear();
-	m_stackCleanupForReturn = 0;
-	m_currentFunction = &_function;
-	m_modifierDepth = 0;
 
 	// stack upon entry: [return address] [arg0] [arg1] ... [argn]
 	// reserve additional slots: [retarg0] ... [retargm] [localvar0] ... [localvarp]
 
 	unsigned parametersSize = CompilerUtils::getSizeOnStack(_function.getParameters());
-	m_context.adjustStackOffset(parametersSize);
+	if (!_function.isConstructor())
+		// adding 1 for return address.
+		m_context.adjustStackOffset(parametersSize + 1);
 	for (ASTPointer<VariableDeclaration const> const& variable: _function.getParameters())
 	{
 		m_context.addVariable(*variable, parametersSize);
 		parametersSize -= variable->getType()->getSizeOnStack();
 	}
+
 	for (ASTPointer<VariableDeclaration const> const& variable: _function.getReturnParameters())
 		m_context.addAndInitializeVariable(*variable);
 	for (VariableDeclaration const* localVariable: _function.getLocalVariables())
 		m_context.addAndInitializeVariable(*localVariable);
 
+	if (_function.isConstructor())
+		if (auto c = m_context.getNextConstructor(dynamic_cast<ContractDefinition const&>(*_function.getScope())))
+			appendBaseConstructor(*c);
+
+	m_returnTag = m_context.newTag();
+	m_breakTags.clear();
+	m_continueTags.clear();
+	m_stackCleanupForReturn = 0;
+	m_currentFunction = &_function;
+	m_modifierDepth = 0;
+
 	appendModifierOrFunctionCode();
 
 	m_context << m_returnTag;
@@ -352,8 +364,14 @@ bool Compiler::visit(FunctionDefinition const& _function)
 		}
 	//@todo assert that everything is in place now
 
-	m_context << eth::Instruction::JUMP;
+	for (ASTPointer<VariableDeclaration const> const& variable: _function.getParameters() + _function.getReturnParameters())
+		m_context.removeVariable(*variable);
+	for (VariableDeclaration const* localVariable: _function.getLocalVariables())
+		m_context.removeVariable(*localVariable);
 
+	m_context.adjustStackOffset(-c_returnValuesSize);
+	if (!_function.isConstructor())
+		m_context << eth::Instruction::JUMP;
 	return false;
 }
 
@@ -515,6 +533,16 @@ void Compiler::appendModifierOrFunctionCode()
 	else
 	{
 		ASTPointer<ModifierInvocation> const& modifierInvocation = m_currentFunction->getModifiers()[m_modifierDepth];
+
+		// constructor call should be excluded
+		if (dynamic_cast<ContractDefinition const*>(modifierInvocation->getName()->getReferencedDeclaration()))
+		{
+			++m_modifierDepth;
+			appendModifierOrFunctionCode();
+			--m_modifierDepth;
+			return;
+		}
+
 		ModifierDefinition const& modifier = m_context.getFunctionModifier(modifierInvocation->getName()->getName());
 		CompilerContext::LocationSetter locationSetter(m_context, &modifier);
 		solAssert(modifier.getParameters().size() == modifierInvocation->getArguments().size(), "");

libsolidity/Compiler.h

@@ -55,9 +55,8 @@ private:
 	/// Adds the code that is run at creation time. Should be run after exchanging the run-time context
 	/// with a new and initialized context. Adds the constructor code.
 	void packIntoContractCreator(ContractDefinition const& _contract, CompilerContext const& _runtimeContext);
-	void appendBaseConstructorCall(FunctionDefinition const& _constructor,
-								   std::vector<ASTPointer<Expression>> const& _arguments);
-	void appendConstructorCall(FunctionDefinition const& _constructor);
+	void appendBaseConstructor(FunctionDefinition const& _constructor);
+	void appendConstructor(FunctionDefinition const& _constructor);
 	void appendFunctionSelector(ContractDefinition const& _contract);
 	/// Creates code that unpacks the arguments for the given function represented by a vector of TypePointers.
 	/// From memory if @a _fromMemory is true, otherwise from call data.
@@ -94,6 +93,8 @@ private:
 	unsigned m_modifierDepth = 0;
 	FunctionDefinition const* m_currentFunction;
 	unsigned m_stackCleanupForReturn; ///< this number of stack elements need to be removed before jump to m_returnTag
+	// arguments for base constructors, filled in derived-to-base order
+	std::map<FunctionDefinition const*, std::vector<ASTPointer<Expression>> const*> m_baseArguments;
 };
 
 }

libsolidity/CompilerContext.cpp

@@ -51,8 +51,6 @@ void CompilerContext::addStateVariable(VariableDeclaration const& _declaration)
 void CompilerContext::startFunction(Declaration const& _function)
 {
 	m_functionsWithCode.insert(&_function);
-	m_localVariables.clear();
-	m_asm.setDeposit(0);
 	*this << getFunctionEntryLabel(_function);
 }
 
@@ -63,6 +61,12 @@ void CompilerContext::addVariable(VariableDeclaration const& _declaration,
 	m_localVariables[&_declaration] = unsigned(m_asm.deposit()) - _offsetToCurrent;
 }
 
+void CompilerContext::removeVariable(VariableDeclaration const& _declaration)
+{
+	solAssert(m_localVariables.count(&_declaration), "");
+	m_localVariables.erase(&_declaration);
+}
+
 void CompilerContext::addAndInitializeVariable(VariableDeclaration const& _declaration)
 {
 	LocationSetter locationSetter(*this, &_declaration);
@@ -110,11 +114,8 @@ eth::AssemblyItem CompilerContext::getVirtualFunctionEntryLabel(FunctionDefiniti
 
 eth::AssemblyItem CompilerContext::getSuperFunctionEntryLabel(string const& _name, ContractDefinition const& _base)
 {
-	// search for first contract after _base
-	solAssert(!m_inheritanceHierarchy.empty(), "No inheritance hierarchy set.");
-	auto it = find(m_inheritanceHierarchy.begin(), m_inheritanceHierarchy.end(), &_base);
-	solAssert(it != m_inheritanceHierarchy.end(), "Base not found in inheritance hierarchy.");
-	for (++it; it != m_inheritanceHierarchy.end(); ++it)
+	auto it = getSuperContract(_base);
+	for (; it != m_inheritanceHierarchy.end(); ++it)
 		for (ASTPointer<FunctionDefinition> const& function: (*it)->getDefinedFunctions())
 			if (!function->isConstructor() && function->getName() == _name)
 				return getFunctionEntryLabel(*function);
@@ -122,6 +123,16 @@ eth::AssemblyItem CompilerContext::getSuperFunctionEntryLabel(string const& _nam
 	return m_asm.newTag(); // not reached
 }
 
+FunctionDefinition const* CompilerContext::getNextConstructor(ContractDefinition const& _contract) const
+{
+	vector<ContractDefinition const*>::const_iterator it = getSuperContract(_contract);
+	for (; it != m_inheritanceHierarchy.end(); ++it)
+		if ((*it)->getConstructor())
+			return (*it)->getConstructor();
+
+	return nullptr;
+}
+
 set<Declaration const*> CompilerContext::getFunctionsWithoutCode()
 {
 	set<Declaration const*> functions;
@@ -201,5 +212,13 @@ CompilerContext& CompilerContext::operator<<(bytes const& _data)
 	return *this;
 }
 
+vector<ContractDefinition const*>::const_iterator CompilerContext::getSuperContract(ContractDefinition const& _contract) const
+{
+	solAssert(!m_inheritanceHierarchy.empty(), "No inheritance hierarchy set.");
+	auto it = find(m_inheritanceHierarchy.begin(), m_inheritanceHierarchy.end(), &_contract);
+	solAssert(it != m_inheritanceHierarchy.end(), "Base not found in inheritance hierarchy.");
+	return ++it;
+}
+
 }
 }

libsolidity/CompilerContext.h

@@ -43,11 +43,13 @@ public:
 	void addMagicGlobal(MagicVariableDeclaration const& _declaration);
 	void addStateVariable(VariableDeclaration const& _declaration);
 	void addVariable(VariableDeclaration const& _declaration, unsigned _offsetToCurrent = 0);
+	void removeVariable(VariableDeclaration const& _declaration);
 	void addAndInitializeVariable(VariableDeclaration const& _declaration);
 
 	void setCompiledContracts(std::map<ContractDefinition const*, bytes const*> const& _contracts) { m_compiledContracts = _contracts; }
 	bytes const& getCompiledContract(ContractDefinition const& _contract) const;
 
+	void setStackOffset(int _offset) { m_asm.setDeposit(_offset); }
 	void adjustStackOffset(int _adjustment) { m_asm.adjustDeposit(_adjustment); }
 	unsigned getStackHeight() const { solAssert(m_asm.deposit() >= 0, ""); return unsigned(m_asm.deposit()); }
 
@@ -62,6 +64,8 @@ public:
 	/// @returns the entry label of function with the given name from the most derived class just
 	/// above _base in the current inheritance hierarchy.
 	eth::AssemblyItem getSuperFunctionEntryLabel(std::string const& _name, ContractDefinition const& _base);
+	FunctionDefinition const* getNextConstructor(ContractDefinition const& _contract) const;
+
 	/// @returns the set of functions for which we still need to generate code
 	std::set<Declaration const*> getFunctionsWithoutCode();
 	/// Resets function specific members, inserts the function entry label and marks the function
@@ -126,9 +130,11 @@ public:
 		LocationSetter(CompilerContext& _compilerContext, ASTNode const* _node):
 			ScopeGuard(std::bind(&CompilerContext::popVisitedNodes, _compilerContext)) { _compilerContext.pushVisitedNodes(_node); }
 	};
-	eth::Assembly m_asm;
+
 private:
+	std::vector<ContractDefinition const*>::const_iterator getSuperContract(const ContractDefinition &_contract) const;
 
+	eth::Assembly m_asm;
 	/// Magic global variables like msg, tx or this, distinguished by type.
 	std::set<Declaration const*> m_magicGlobals;
 	/// Other already compiled contracts to be used in contract creation calls.

libsolidity/CompilerStack.cpp

@@ -155,6 +155,16 @@ bytes const& CompilerStack::compile(string const& _sourceCode, bool _optimize)
 	return getBytecode();
 }
 
+eth::AssemblyItems const& CompilerStack::getAssemblyItems(string const& _contractName) const
+{
+	return getContract(_contractName).compiler->getAssemblyItems();
+}
+
+eth::AssemblyItems const& CompilerStack::getRuntimeAssemblyItems(string const& _contractName) const
+{
+	return getContract(_contractName).compiler->getRuntimeAssemblyItems();
+}
+
 bytes const& CompilerStack::getBytecode(string const& _contractName) const
 {
 	return getContract(_contractName).bytecode;

libsolidity/CompilerStack.h

@@ -26,12 +26,22 @@
 #include <ostream>
 #include <string>
 #include <memory>
+#include <vector>
 #include <boost/noncopyable.hpp>
 #include <libdevcore/Common.h>
 #include <libdevcore/FixedHash.h>
 
-namespace dev {
-namespace solidity {
+namespace dev
+{
+
+namespace eth
+{
+class AssemblyItem;
+using AssemblyItems = std::vector<AssemblyItem>;
+}
+
+namespace solidity
+{
 
 // forward declarations
 class Scanner;
@@ -85,6 +95,10 @@ public:
 	bytes const& getBytecode(std::string const& _contractName = "") const;
 	/// @returns the runtime bytecode for the contract, i.e. the code that is returned by the constructor.
 	bytes const& getRuntimeBytecode(std::string const& _contractName = "") const;
+	/// @returns normal contract assembly items
+	eth::AssemblyItems const& getAssemblyItems(std::string const& _contractName = "") const;
+	/// @returns runtime contract assembly items
+	eth::AssemblyItems const& getRuntimeAssemblyItems(std::string const& _contractName = "") const;
 	/// @returns hash of the runtime bytecode for the contract, i.e. the code that is returned by the constructor.
 	dev::h256 getContractCodeHash(std::string const& _contractName = "") const;
 

libsolidity/CompilerUtils.cpp

@@ -164,134 +164,6 @@ void CompilerUtils::computeHashStatic(Type const& _type, bool _padToWordBoundari
 	m_context << u256(length) << u256(0) << eth::Instruction::SHA3;
 }
 
-void CompilerUtils::copyByteArrayToStorage(
-	ArrayType const& _targetType, ArrayType const& _sourceType) const
-{
-	// stack layout: [source_ref] target_ref (top)
-	// need to leave target_ref on the stack at the end
-	solAssert(_targetType.getLocation() == ArrayType::Location::Storage, "");
-	solAssert(_targetType.isByteArray(), "Non byte arrays not yet implemented here.");
-	solAssert(_sourceType.isByteArray(), "Non byte arrays not yet implemented here.");
-
-	switch (_sourceType.getLocation())
-	{
-	case ArrayType::Location::CallData:
-	{
-		// This also assumes that after "length" we only have zeros, i.e. it cannot be used to
-		// slice a byte array from calldata.
-
-		// stack: source_offset source_len target_ref
-		// fetch old length and convert to words
-		m_context << eth::Instruction::DUP1 << eth::Instruction::SLOAD;
-		m_context << u256(31) << eth::Instruction::ADD
-				  << u256(32) << eth::Instruction::SWAP1 << eth::Instruction::DIV;
-		// stack here: source_offset source_len target_ref target_length_words
-		// actual array data is stored at SHA3(storage_offset)
-		m_context << eth::Instruction::DUP2;
-		CompilerUtils(m_context).computeHashStatic();
-		// compute target_data_end
-		m_context << eth::Instruction::DUP1 << eth::Instruction::SWAP2 << eth::Instruction::ADD
-				  << eth::Instruction::SWAP1;
-		// stack here: source_offset source_len target_ref target_data_end target_data_ref
-		// store length (in bytes)
-		m_context << eth::Instruction::DUP4 << eth::Instruction::DUP1 << eth::Instruction::DUP5
-			<< eth::Instruction::SSTORE;
-		// jump to end if length is zero
-		m_context << eth::Instruction::ISZERO;
-		eth::AssemblyItem copyLoopEnd = m_context.newTag();
-		m_context.appendConditionalJumpTo(copyLoopEnd);
-		// store start offset
-		m_context << eth::Instruction::DUP5;
-		// stack now: source_offset source_len target_ref target_data_end target_data_ref calldata_offset
-		eth::AssemblyItem copyLoopStart = m_context.newTag();
-		m_context << copyLoopStart
-				  // copy from calldata and store
-				  << eth::Instruction::DUP1 << eth::Instruction::CALLDATALOAD
-				  << eth::Instruction::DUP3 << eth::Instruction::SSTORE
-				  // increment target_data_ref by 1
-				  << eth::Instruction::SWAP1 << u256(1) << eth::Instruction::ADD
-				  // increment calldata_offset by 32
-				  << eth::Instruction::SWAP1 << u256(32) << eth::Instruction::ADD
-				  // check for loop condition
-				  << eth::Instruction::DUP1 << eth::Instruction::DUP6 << eth::Instruction::GT;
-		m_context.appendConditionalJumpTo(copyLoopStart);
-		m_context << eth::Instruction::POP;
-		m_context << copyLoopEnd;
-
-		// now clear leftover bytes of the old value
-		// stack now: source_offset source_len target_ref target_data_end target_data_ref
-		clearStorageLoop();
-		// stack now: source_offset source_len target_ref target_data_end
-
-		m_context << eth::Instruction::POP << eth::Instruction::SWAP2
-			<< eth::Instruction::POP << eth::Instruction::POP;
-		break;
-	}
-	case ArrayType::Location::Storage:
-	{
-		// this copies source to target and also clears target if it was larger
-
-		// stack: source_ref target_ref
-		// store target_ref
-		m_context << eth::Instruction::SWAP1 << eth::Instruction::DUP2;
-		// fetch lengthes
-		m_context << eth::Instruction::DUP1 << eth::Instruction::SLOAD << eth::Instruction::SWAP2
-				  << eth::Instruction::DUP1 << eth::Instruction::SLOAD;
-		// stack: target_ref target_len_bytes target_ref source_ref source_len_bytes
-		// store new target length
-		m_context << eth::Instruction::DUP1 << eth::Instruction::DUP4 << eth::Instruction::SSTORE;
-		// compute hashes (data positions)
-		m_context << eth::Instruction::SWAP2;
-		CompilerUtils(m_context).computeHashStatic();
-		m_context << eth::Instruction::SWAP1;
-		CompilerUtils(m_context).computeHashStatic();
-		// stack: target_ref target_len_bytes source_len_bytes target_data_pos source_data_pos
-		// convert lengthes from bytes to storage slots
-		m_context << u256(31) << u256(32) << eth::Instruction::DUP1 << eth::Instruction::DUP3
-				  << eth::Instruction::DUP8 << eth::Instruction::ADD << eth::Instruction::DIV
-				  << eth::Instruction::SWAP2
-				  << eth::Instruction::DUP6 << eth::Instruction::ADD << eth::Instruction::DIV;
-		// stack: target_ref target_len_bytes source_len_bytes target_data_pos source_data_pos target_len source_len
-		// @todo we might be able to go without a third counter
-		m_context << u256(0);
-		// stack: target_ref target_len_bytes source_len_bytes target_data_pos source_data_pos target_len source_len counter
-		eth::AssemblyItem copyLoopStart = m_context.newTag();
-		m_context << copyLoopStart;
-		// check for loop condition
-		m_context << eth::Instruction::DUP1 << eth::Instruction::DUP3
-				   << eth::Instruction::GT << eth::Instruction::ISZERO;
-		eth::AssemblyItem copyLoopEnd = m_context.newTag();
-		m_context.appendConditionalJumpTo(copyLoopEnd);
-		// copy
-		m_context << eth::Instruction::DUP4 << eth::Instruction::DUP2 << eth::Instruction::ADD
-				  << eth::Instruction::SLOAD
-				  << eth::Instruction::DUP6 << eth::Instruction::DUP3 << eth::Instruction::ADD
-				  << eth::Instruction::SSTORE;
-		// increment
-		m_context << u256(1) << eth::Instruction::ADD;
-		m_context.appendJumpTo(copyLoopStart);
-		m_context << copyLoopEnd;
-
-		// zero-out leftovers in target
-		// stack: target_ref target_len_bytes source_len_bytes target_data_pos source_data_pos target_len source_len counter
-		// add counter to target_data_pos
-		m_context << eth::Instruction::DUP5 << eth::Instruction::ADD
-				  << eth::Instruction::SWAP5 << eth::Instruction::POP;
-		// stack: target_ref target_len_bytes target_data_pos_updated target_data_pos source_data_pos target_len source_len
-		// add length to target_data_pos to get target_data_end
-		m_context << eth::Instruction::POP << eth::Instruction::DUP3 << eth::Instruction::ADD
-				  << eth::Instruction::SWAP4
-				  << eth::Instruction::POP  << eth::Instruction::POP << eth::Instruction::POP;
-		// stack: target_ref target_data_end target_data_pos_updated
-		clearStorageLoop();
-		m_context << eth::Instruction::POP;
-		break;
-	}
-	default:
-		solAssert(false, "Given byte array location not implemented.");
-	}
-}
-
 unsigned CompilerUtils::loadFromMemoryHelper(Type const& _type, bool _fromCalldata, bool _padToWordBoundaries)
 {
 	unsigned _encodedSize = _type.getCalldataEncodedSize();
@@ -316,28 +188,6 @@ unsigned CompilerUtils::loadFromMemoryHelper(Type const& _type, bool _fromCallda
 	return numBytes;
 }
 
-void CompilerUtils::clearByteArray(ArrayType const& _type) const
-{
-	solAssert(_type.getLocation() == ArrayType::Location::Storage, "");
-	solAssert(_type.isByteArray(), "Non byte arrays not yet implemented here.");
-
-	// fetch length
-	m_context << eth::Instruction::DUP1 << eth::Instruction::SLOAD;
-	// set length to zero
-	m_context << u256(0) << eth::Instruction::DUP3 << eth::Instruction::SSTORE;
-	// convert length from bytes to storage slots
-	m_context << u256(31) << eth::Instruction::ADD
-			  << u256(32) << eth::Instruction::SWAP1 << eth::Instruction::DIV;
-	// compute data positions
-	m_context << eth::Instruction::SWAP1;
-	CompilerUtils(m_context).computeHashStatic();
-	// stack: len data_pos
-	m_context << eth::Instruction::SWAP1 << eth::Instruction::DUP2 << eth::Instruction::ADD
-			  << eth::Instruction::SWAP1;
-	clearStorageLoop();
-	// cleanup
-	m_context << eth::Instruction::POP;
-}
 
 unsigned CompilerUtils::prepareMemoryStore(Type const& _type, bool _padToWordBoundaries) const
 {
@@ -356,25 +206,5 @@ unsigned CompilerUtils::prepareMemoryStore(Type const& _type, bool _padToWordBou
 	return numBytes;
 }
 
-void CompilerUtils::clearStorageLoop() const
-{
-	// stack: end_pos pos
-	eth::AssemblyItem loopStart = m_context.newTag();
-	m_context << loopStart;
-	// check for loop condition
-	m_context << eth::Instruction::DUP1 << eth::Instruction::DUP3
-			   << eth::Instruction::GT << eth::Instruction::ISZERO;
-	eth::AssemblyItem zeroLoopEnd = m_context.newTag();
-	m_context.appendConditionalJumpTo(zeroLoopEnd);
-	// zero out
-	m_context << u256(0) << eth::Instruction::DUP2 << eth::Instruction::SSTORE;
-	// increment
-	m_context << u256(1) << eth::Instruction::ADD;
-	m_context.appendJumpTo(loopStart);
-	// cleanup
-	m_context << zeroLoopEnd;
-	m_context << eth::Instruction::POP;
-}
-
 }
 }

libsolidity/CompilerUtils.h

@@ -79,15 +79,6 @@ public:
 	/// @note Only works for types of fixed size.
 	void computeHashStatic(Type const& _type = IntegerType(256), bool _padToWordBoundaries = false);
 
-	/// Copies a byte array to a byte array in storage.
-	/// Stack pre: [source_reference] target_reference
-	/// Stack post: target_reference
-	void copyByteArrayToStorage(ArrayType const& _targetType, ArrayType const& _sourceType) const;
-	/// Clears the length and data elements of the byte array referenced on the stack.
-	/// Stack pre: reference
-	/// Stack post:
-	void clearByteArray(ArrayType const& _type) const;
-
 	/// Bytes we need to the start of call data.
 	///  - The size in bytes of the function (hash) identifier.
 	static const unsigned int dataStartOffset;
@@ -97,10 +88,6 @@ private:
 	unsigned prepareMemoryStore(Type const& _type, bool _padToWordBoundaries) const;
 	/// Loads type from memory assuming memory offset is on stack top.
 	unsigned loadFromMemoryHelper(Type const& _type, bool _fromCalldata, bool _padToWordBoundaries);
-	/// Appends a loop that clears a sequence of storage slots (excluding end).
-	/// Stack pre: end_ref start_ref
-	/// Stack post: end_ref
-	void clearStorageLoop() const;
 
 	CompilerContext& m_context;
 };

libsolidity/ExpressionCompiler.cpp

@@ -93,7 +93,7 @@ void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const&
 			m_context << eth::Instruction::DUP1
 					  << structType->getStorageOffsetOfMember(names[i])
 					  << eth::Instruction::ADD;
-			StorageItem(m_context, types[i]).retrieveValue(SourceLocation(), true);
+			StorageItem(m_context, *types[i]).retrieveValue(SourceLocation(), true);
 			solAssert(types[i]->getSizeOnStack() == 1, "Returning struct elements with stack size != 1 not yet implemented.");
 			m_context << eth::Instruction::SWAP1;
 			retSizeOnStack += types[i]->getSizeOnStack();
@@ -104,7 +104,7 @@ void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const&
 	{
 		// simple value
 		solAssert(accessorType.getReturnParameterTypes().size() == 1, "");
-		StorageItem(m_context, returnType).retrieveValue(SourceLocation(), true);
+		StorageItem(m_context, *returnType).retrieveValue(SourceLocation(), true);
 		retSizeOnStack = returnType->getSizeOnStack();
 	}
 	solAssert(retSizeOnStack <= 15, "Stack too deep.");
@@ -680,7 +680,7 @@ void ExpressionCompiler::endVisit(MemberAccess const& _memberAccess)
 				m_context << eth::Instruction::SWAP1 << eth::Instruction::POP;
 				break;
 			case ArrayType::Location::Storage:
-				setLValueToStorageItem(_memberAccess);
+				setLValue<StorageArrayLength>(_memberAccess, type);
 				break;
 			default:
 				solAssert(false, "Unsupported array location.");
@@ -1047,7 +1047,7 @@ void ExpressionCompiler::setLValueFromDeclaration(Declaration const& _declaratio
 
 void ExpressionCompiler::setLValueToStorageItem(Expression const& _expression)
 {
-	setLValue<StorageItem>(_expression, _expression.getType());
+	setLValue<StorageItem>(_expression, *_expression.getType());
 }
 
 }

libsolidity/LValue.cpp

@@ -32,15 +32,14 @@ using namespace solidity;
 
 
 StackVariable::StackVariable(CompilerContext& _compilerContext, Declaration const& _declaration):
-	LValue(_compilerContext, _declaration.getType()),
+	LValue(_compilerContext, *_declaration.getType()),
 	m_baseStackOffset(m_context.getBaseStackOffsetOfVariable(_declaration)),
-	m_size(m_dataType->getSizeOnStack())
+	m_size(m_dataType.getSizeOnStack())
 {
 }
 
-void StackVariable::retrieveValue(SourceLocation const& _location, bool _remove) const
+void StackVariable::retrieveValue(SourceLocation const& _location, bool) const
 {
-	(void)_remove;
 	unsigned stackPos = m_context.baseToCurrentStackOffset(m_baseStackOffset);
 	if (stackPos >= 15) //@todo correct this by fetching earlier or moving to memory
 		BOOST_THROW_EXCEPTION(CompilerError()
@@ -49,9 +48,8 @@ void StackVariable::retrieveValue(SourceLocation const& _location, bool _remove)
 		m_context << eth::dupInstruction(stackPos + 1);
 }
 
-void StackVariable::storeValue(Type const& _sourceType, SourceLocation const& _location, bool _move) const
+void StackVariable::storeValue(Type const&, SourceLocation const& _location, bool _move) const
 {
-	(void)_sourceType;
 	unsigned stackDiff = m_context.baseToCurrentStackOffset(m_baseStackOffset) - m_size + 1;
 	if (stackDiff > 16)
 		BOOST_THROW_EXCEPTION(CompilerError()
@@ -63,7 +61,7 @@ void StackVariable::storeValue(Type const& _sourceType, SourceLocation const& _l
 		retrieveValue(_location);
 }
 
-void StackVariable::setToZero(SourceLocation const& _location) const
+void StackVariable::setToZero(SourceLocation const& _location, bool) const
 {
 	unsigned stackDiff = m_context.baseToCurrentStackOffset(m_baseStackOffset);
 	if (stackDiff > 16)
@@ -77,20 +75,20 @@ void StackVariable::setToZero(SourceLocation const& _location) const
 
 
 StorageItem::StorageItem(CompilerContext& _compilerContext, Declaration const& _declaration):
-	StorageItem(_compilerContext, _declaration.getType())
+	StorageItem(_compilerContext, *_declaration.getType())
 {
 	m_context << m_context.getStorageLocationOfVariable(_declaration);
 }
 
-StorageItem::StorageItem(CompilerContext& _compilerContext, TypePointer const& _type):
+StorageItem::StorageItem(CompilerContext& _compilerContext, Type const& _type):
 	LValue(_compilerContext, _type)
 {
-	if (m_dataType->isValueType())
+	if (m_dataType.isValueType())
 	{
-		solAssert(m_dataType->getStorageSize() == m_dataType->getSizeOnStack(), "");
-		solAssert(m_dataType->getStorageSize() <= numeric_limits<unsigned>::max(),
-			"The storage size of " + m_dataType->toString() + " should fit in an unsigned");
-		m_size = unsigned(m_dataType->getStorageSize());
+		solAssert(m_dataType.getStorageSize() == m_dataType.getSizeOnStack(), "");
+		solAssert(m_dataType.getStorageSize() <= numeric_limits<unsigned>::max(),
+			"The storage size of " + m_dataType.toString() + " should fit in an unsigned");
+		m_size = unsigned(m_dataType.getStorageSize());
 	}
 	else
 		m_size = 0; // unused
@@ -98,7 +96,7 @@ StorageItem::StorageItem(CompilerContext& _compilerContext, TypePointer const& _
 
 void StorageItem::retrieveValue(SourceLocation const&, bool _remove) const
 {
-	if (!m_dataType->isValueType())
+	if (!m_dataType.isValueType())
 		return; // no distinction between value and reference for non-value types
 	if (!_remove)
 		m_context << eth::Instruction::DUP1;
@@ -118,7 +116,7 @@ void StorageItem::retrieveValue(SourceLocation const&, bool _remove) const
 void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _location, bool _move) const
 {
 	// stack layout: value value ... value target_ref
-	if (m_dataType->isValueType())
+	if (m_dataType.isValueType())
 	{
 		if (!_move) // copy values
 		{
@@ -143,20 +141,20 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc
 	}
 	else
 	{
-		solAssert(_sourceType.getCategory() == m_dataType->getCategory(),
+		solAssert(_sourceType.getCategory() == m_dataType.getCategory(),
 			"Wrong type conversation for assignment.");
-		if (m_dataType->getCategory() == Type::Category::Array)
+		if (m_dataType.getCategory() == Type::Category::Array)
 		{
-			CompilerUtils(m_context).copyByteArrayToStorage(
-						dynamic_cast<ArrayType const&>(*m_dataType),
+			ArrayUtils(m_context).copyArrayToStorage(
+						dynamic_cast<ArrayType const&>(m_dataType),
 						dynamic_cast<ArrayType const&>(_sourceType));
 			if (_move)
 				m_context << eth::Instruction::POP;
 		}
-		else if (m_dataType->getCategory() == Type::Category::Struct)
+		else if (m_dataType.getCategory() == Type::Category::Struct)
 		{
 			// stack layout: source_ref target_ref
-			auto const& structType = dynamic_cast<StructType const&>(*m_dataType);
+			auto const& structType = dynamic_cast<StructType const&>(m_dataType);
 			solAssert(structType == _sourceType, "Struct assignment with conversion.");
 			for (auto const& member: structType.getMembers())
 			{
@@ -167,12 +165,12 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc
 				m_context << structType.getStorageOffsetOfMember(member.first)
 					<< eth::Instruction::DUP3 << eth::Instruction::DUP2 << eth::Instruction::ADD;
 				// stack: source_ref target_ref member_offset source_member_ref
-				StorageItem(m_context, memberType).retrieveValue(_location, true);
+				StorageItem(m_context, *memberType).retrieveValue(_location, true);
 				// stack: source_ref target_ref member_offset source_value...
 				m_context << eth::dupInstruction(2 + memberType->getSizeOnStack())
 					<< eth::dupInstruction(2 + memberType->getSizeOnStack()) << eth::Instruction::ADD;
 				// stack: source_ref target_ref member_offset source_value... target_member_ref
-				StorageItem(m_context, memberType).storeValue(*memberType, _location, true);
+				StorageItem(m_context, *memberType).storeValue(*memberType, _location, true);
 				m_context << eth::Instruction::POP;
 			}
 			if (_move)
@@ -187,16 +185,18 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc
 	}
 }
 
-
-void StorageItem::setToZero(SourceLocation const& _location) const
+void StorageItem::setToZero(SourceLocation const&, bool _removeReference) const
 {
-	(void)_location;
-	if (m_dataType->getCategory() == Type::Category::Array)
-		CompilerUtils(m_context).clearByteArray(dynamic_cast<ArrayType const&>(*m_dataType));
-	else if (m_dataType->getCategory() == Type::Category::Struct)
+	if (m_dataType.getCategory() == Type::Category::Array)
+	{
+		if (!_removeReference)
+			m_context << eth::Instruction::DUP1;
+		ArrayUtils(m_context).clearArray(dynamic_cast<ArrayType const&>(m_dataType));
+	}
+	else if (m_dataType.getCategory() == Type::Category::Struct)
 	{
 		// stack layout: ref
-		auto const& structType = dynamic_cast<StructType const&>(*m_dataType);
+		auto const& structType = dynamic_cast<StructType const&>(m_dataType);
 		for (auto const& member: structType.getMembers())
 		{
 			// zero each member that is not a mapping
@@ -205,19 +205,61 @@ void StorageItem::setToZero(SourceLocation const& _location) const
 				continue;
 			m_context << structType.getStorageOffsetOfMember(member.first)
 				<< eth::Instruction::DUP2 << eth::Instruction::ADD;
-			StorageItem(m_context, memberType).setToZero();
+			StorageItem(m_context, *memberType).setToZero();
 		}
-		m_context << eth::Instruction::POP;
+		if (_removeReference)
+			m_context << eth::Instruction::POP;
 	}
 	else
 	{
-		if (m_size == 0)
+		if (m_size == 0 && _removeReference)
 			m_context << eth::Instruction::POP;
-		for (unsigned i = 0; i < m_size; ++i)
-			if (i + 1 >= m_size)
-				m_context << u256(0) << eth::Instruction::SWAP1 << eth::Instruction::SSTORE;
-			else
-				m_context << u256(0) << eth::Instruction::DUP2 << eth::Instruction::SSTORE
-					<< u256(1) << eth::Instruction::ADD;
+		else if (m_size == 1)
+			m_context
+				<< u256(0) << (_removeReference ? eth::Instruction::SWAP1 : eth::Instruction::DUP2)
+				<< eth::Instruction::SSTORE;
+		else
+		{
+			if (!_removeReference)
+				m_context << eth::Instruction::DUP1;
+			for (unsigned i = 0; i < m_size; ++i)
+				if (i + 1 >= m_size)
+					m_context << u256(0) << eth::Instruction::SWAP1 << eth::Instruction::SSTORE;
+				else
+					m_context << u256(0) << eth::Instruction::DUP2 << eth::Instruction::SSTORE
+						<< u256(1) << eth::Instruction::ADD;
+		}
 	}
 }
+
+
+StorageArrayLength::StorageArrayLength(CompilerContext& _compilerContext, const ArrayType& _arrayType):
+	LValue(_compilerContext, *_arrayType.getMemberType("length")),
+	m_arrayType(_arrayType)
+{
+	solAssert(m_arrayType.isDynamicallySized(), "");
+}
+
+void StorageArrayLength::retrieveValue(SourceLocation const&, bool _remove) const
+{
+	if (!_remove)
+		m_context << eth::Instruction::DUP1;
+	m_context << eth::Instruction::SLOAD;
+}
+
+void StorageArrayLength::storeValue(Type const&, SourceLocation const&, bool _move) const
+{
+	if (_move)
+		m_context << eth::Instruction::SWAP1;
+	else
+		m_context << eth::Instruction::DUP2;
+	ArrayUtils(m_context).resizeDynamicArray(m_arrayType);
+}
+
+void StorageArrayLength::setToZero(SourceLocation const&, bool _removeReference) const
+{
+	if (!_removeReference)
+		m_context << eth::Instruction::DUP1;
+	ArrayUtils(m_context).clearDynamicArray(m_arrayType);
+}
+

libsolidity/LValue.h

@@ -24,6 +24,7 @@
 
 #include <memory>
 #include <libevmcore/SourceLocation.h>
+#include <libsolidity/ArrayUtils.h>
 
 namespace dev
 {
@@ -32,6 +33,7 @@ namespace solidity
 
 class Declaration;
 class Type;
+class ArrayType;
 class CompilerContext;
 
 /**
@@ -40,7 +42,7 @@ class CompilerContext;
 class LValue
 {
 protected:
-	LValue(CompilerContext& _compilerContext, std::shared_ptr<Type const> const& _dataType):
+	LValue(CompilerContext& _compilerContext, Type const& _dataType):
 		m_context(_compilerContext), m_dataType(_dataType) {}
 
 public:
@@ -56,13 +58,14 @@ public:
 	/// Stack post: if !_move: value_of(lvalue_ref)
 	virtual void storeValue(Type const& _sourceType,
 		SourceLocation const& _location = SourceLocation(), bool _move = false) const = 0;
-	/// Stores zero in the lvalue.
+	/// Stores zero in the lvalue. Removes the reference from the stack if @a _removeReference is true.
 	/// @a _location is the source location of the requested operation
-	virtual void setToZero(SourceLocation const& _location = SourceLocation()) const = 0;
+	virtual void setToZero(
+		SourceLocation const& _location = SourceLocation(), bool _removeReference = true) const = 0;
 
 protected:
 	CompilerContext& m_context;
-	std::shared_ptr<Type const> m_dataType;
+	Type const& m_dataType;
 };
 
 /**
@@ -71,13 +74,14 @@ protected:
 class StackVariable: public LValue
 {
 public:
-	explicit StackVariable(CompilerContext& _compilerContext, Declaration const& _declaration);
+	StackVariable(CompilerContext& _compilerContext, Declaration const& _declaration);
 
 	virtual bool storesReferenceOnStack() const { return false; }
 	virtual void retrieveValue(SourceLocation const& _location, bool _remove = false) const override;
 	virtual void storeValue(Type const& _sourceType,
 		SourceLocation const& _location = SourceLocation(), bool _move = false) const override;
-	virtual void setToZero(SourceLocation const& _location = SourceLocation()) const override;
+	virtual void setToZero(
+		SourceLocation const& _location = SourceLocation(), bool _removeReference = true) const override;
 
 private:
 	/// Base stack offset (@see CompilerContext::getBaseStackOffsetOfVariable) of the local variable.
@@ -93,14 +97,15 @@ class StorageItem: public LValue
 {
 public:
 	/// Constructs the LValue and pushes the location of @a _declaration onto the stack.
-	explicit StorageItem(CompilerContext& _compilerContext, Declaration const& _declaration);
+	StorageItem(CompilerContext& _compilerContext, Declaration const& _declaration);
 	/// Constructs the LValue and assumes that the storage reference is already on the stack.
-	explicit StorageItem(CompilerContext& _compilerContext, std::shared_ptr<Type const> const& _type);
+	StorageItem(CompilerContext& _compilerContext, Type const& _type);
 	virtual bool storesReferenceOnStack() const { return true; }
 	virtual void retrieveValue(SourceLocation const& _location, bool _remove = false) const override;
 	virtual void storeValue(Type const& _sourceType,
 		SourceLocation const& _location = SourceLocation(), bool _move = false) const override;
-	virtual void setToZero(SourceLocation const& _location = SourceLocation()) const override;
+	virtual void setToZero(
+		SourceLocation const& _location = SourceLocation(), bool _removeReference = true) const override;
 
 private:
 	/// Number of stack elements occupied by the value (not the reference).
@@ -108,5 +113,26 @@ private:
 	unsigned m_size;
 };
 
+/**
+ * Reference to the "length" member of a dynamically-sized array. This is an LValue with special
+ * semantics since assignments to it might reduce its length and thus arrays members have to be
+ * deleted.
+ */
+class StorageArrayLength: public LValue
+{
+public:
+	/// Constructs the LValue, assumes that the reference to the array head is already on the stack.
+	StorageArrayLength(CompilerContext& _compilerContext, ArrayType const& _arrayType);
+	virtual bool storesReferenceOnStack() const { return true; }
+	virtual void retrieveValue(SourceLocation const& _location, bool _remove = false) const override;
+	virtual void storeValue(Type const& _sourceType,
+		SourceLocation const& _location = SourceLocation(), bool _move = false) const override;
+	virtual void setToZero(
+		SourceLocation const& _location = SourceLocation(), bool _removeReference = true) const override;
+
+private:
+	ArrayType const& m_arrayType;
+};
+
 }
 }

libsolidity/SourceReferenceFormatter.cpp

@@ -44,8 +44,14 @@ void SourceReferenceFormatter::printSourceLocation(ostream& _stream,
 	tie(endLine, endColumn) = _scanner.translatePositionToLineColumn(_location.end);
 	if (startLine == endLine)
 	{
-		_stream << _scanner.getLineAtPosition(_location.start) << endl
-				<< string(startColumn, ' ') << "^";
+		string line = _scanner.getLineAtPosition(_location.start);
+		_stream << line << endl;
+		std::for_each(line.cbegin(), line.cbegin() + startColumn,
+			[&_stream](char const& ch)
+			{
+				_stream << (ch == '\t' ? '\t' : ' ');
+			});
+		_stream << "^";
 		if (endColumn > startColumn + 2)
 			_stream << string(endColumn - startColumn - 2, '-');
 		if (endColumn > startColumn + 1)

libsolidity/Types.cpp

@@ -537,7 +537,19 @@ TypePointer ContractType::unaryOperatorResult(Token::Value _operator) const
 
 bool ArrayType::isImplicitlyConvertibleTo(const Type& _convertTo) const
 {
-	return _convertTo.getCategory() == getCategory();
+	if (_convertTo.getCategory() != getCategory())
+		return false;
+	auto& convertTo = dynamic_cast<ArrayType const&>(_convertTo);
+	// let us not allow assignment to memory arrays for now
+	if (convertTo.getLocation() != Location::Storage)
+		return false;
+	if (convertTo.isByteArray() != isByteArray())
+		return false;
+	if (!getBaseType()->isImplicitlyConvertibleTo(*convertTo.getBaseType()))
+		return false;
+	if (convertTo.isDynamicallySized())
+		return true;
+	return !isDynamicallySized() && convertTo.getLength() >= getLength();
 }
 
 TypePointer ArrayType::unaryOperatorResult(Token::Value _operator) const
@@ -552,7 +564,10 @@ bool ArrayType::operator==(Type const& _other) const
 	if (_other.getCategory() != getCategory())
 		return false;
 	ArrayType const& other = dynamic_cast<ArrayType const&>(_other);
-	return other.m_location == m_location;
+	if (other.m_location != m_location || other.isByteArray() != isByteArray() ||
+			other.isDynamicallySized() != isDynamicallySized())
+		return false;
+	return isDynamicallySized() || getLength()  == other.getLength();
 }
 
 u256 ArrayType::getStorageSize() const
@@ -628,8 +643,7 @@ MemberList const& ContractType::getMembers() const
 		{
 			for (ContractDefinition const* base: m_contract.getLinearizedBaseContracts())
 				for (ASTPointer<FunctionDefinition> const& function: base->getDefinedFunctions())
-					if (!function->isConstructor() && !function->getName().empty()&&
-							function->isVisibleInDerivedContracts())
+					if (function->isVisibleInDerivedContracts())
 						members.push_back(make_pair(function->getName(), make_shared<FunctionType>(*function, true)));
 		}
 		else
@@ -1024,10 +1038,9 @@ MemberList const& TypeType::getMembers() const
 			vector<ContractDefinition const*> currentBases = m_currentContract->getLinearizedBaseContracts();
 			if (find(currentBases.begin(), currentBases.end(), &contract) != currentBases.end())
 				// We are accessing the type of a base contract, so add all public and protected
-				// functions. Note that this does not add inherited functions on purpose.
-				for (ASTPointer<FunctionDefinition> const& f: contract.getDefinedFunctions())
-					if (!f->isConstructor() && !f->getName().empty() && f->isVisibleInDerivedContracts())
-						members.push_back(make_pair(f->getName(), make_shared<FunctionType>(*f)));
+				// members. Note that this does not add inherited functions on purpose.
+				for (Declaration const* decl: contract.getInheritableMembers())
+					members.push_back(make_pair(decl->getName(), decl->getType()));
 		}
 		else if (m_actualType->getCategory() == Category::Enum)
 		{

mix/AppContext.cpp

@@ -73,6 +73,7 @@ void AppContext::load()
 	qmlRegisterType<QHashType>("org.ethereum.qml.QHashType", 1, 0, "QHashType");
 	qmlRegisterType<QBoolType>("org.ethereum.qml.QBoolType", 1, 0, "QBoolType");
 	qmlRegisterType<QVariableDeclaration>("org.ethereum.qml.QVariableDeclaration", 1, 0, "QVariableDeclaration");
+	qmlRegisterType<RecordLogEntry>("org.ethereum.qml.RecordLogEntry", 1, 0, "RecordLogEntry");
 	QQmlComponent projectModelComponent(m_applicationEngine, QUrl("qrc:/qml/ProjectModel.qml"));
 	QObject* projectModel = projectModelComponent.create();
 	if (projectModelComponent.isError())

mix/ClientModel.cpp

@@ -82,7 +82,7 @@ ClientModel::ClientModel(AppContext* _context):
 	qRegisterMetaType<QInstruction*>("QInstruction");
 	qRegisterMetaType<QCode*>("QCode");
 	qRegisterMetaType<QCallData*>("QCallData");
-	qRegisterMetaType<RecordLogEntry*>("RecordLogEntry");
+	qRegisterMetaType<RecordLogEntry*>("RecordLogEntry*");
 
 	connect(this, &ClientModel::runComplete, this, &ClientModel::showDebugger, Qt::QueuedConnection);
 	m_client.reset(new MixClient(QStandardPaths::writableLocation(QStandardPaths::TempLocation).toStdString()));
@@ -305,8 +305,21 @@ void ClientModel::showDebuggerForTransaction(ExecutionResult const& _t)
 	QDebugData* debugData = new QDebugData();
 	QQmlEngine::setObjectOwnership(debugData, QQmlEngine::JavaScriptOwnership);
 	QList<QCode*> codes;
-	for (bytes const& code: _t.executionCode)
-		codes.push_back(QMachineState::getHumanReadableCode(debugData, code));
+	for (MachineCode const& code: _t.executionCode)
+	{
+		codes.push_back(QMachineState::getHumanReadableCode(debugData, code.address, code.code));
+		//try to resolve contract for source level debugging
+		auto nameIter = m_contractNames.find(code.address);
+		if (nameIter != m_contractNames.end())
+		{
+			CompiledContract const& compilerRes = m_context->codeModel()->contract(nameIter->second);
+			eth::AssemblyItems assemblyItems = !_t.isConstructor() ? compilerRes.assemblyItems() : compilerRes.constructorAssemblyItems();
+			QVariantList locations;
+			for (eth::AssemblyItem const& item: assemblyItems)
+				locations.push_back(QVariant::fromValue(new QSourceLocation(debugData, item.getLocation().start, item.getLocation().end)));
+			codes.back()->setLocations(compilerRes.documentId(), std::move(locations));
+		}
+	}
 
 	QList<QCallData*> data;
 	for (bytes const& d: _t.transactionData)
@@ -325,6 +338,10 @@ void ClientModel::showDebuggerForTransaction(ExecutionResult const& _t)
 	debugDataReady(debugData);
 }
 
+void ClientModel::emptyRecord()
+{
+	debugDataReady(new QDebugData());
+}
 
 void ClientModel::debugRecord(unsigned _index)
 {
@@ -349,6 +366,18 @@ void ClientModel::callContract(Address const& _contract, bytes const& _data, Tra
 	m_client->transact(m_client->userAccount().secret(), _tr.value, _contract, _data, _tr.gas, _tr.gasPrice);
 }
 
+RecordLogEntry* ClientModel::lastBlock() const
+{
+	eth::BlockInfo blockInfo = m_client->blockInfo();
+	std::stringstream strGas;
+	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);
+	QQmlEngine::setObjectOwnership(record, QQmlEngine::JavaScriptOwnership);
+	return record;
+}
+
 void ClientModel::onStateReset()
 {
 	m_contractAddresses.clear();
@@ -424,7 +453,7 @@ void ClientModel::onNewTransaction()
 		}
 	}
 
-	RecordLogEntry* log = new RecordLogEntry(recordIndex, transactionIndex, contract, function, value, address, returned, tr.isCall());
+	RecordLogEntry* log = new RecordLogEntry(recordIndex, transactionIndex, contract, function, value, address, returned, tr.isCall(), RecordLogEntry::RecordType::Transaction);
 	QQmlEngine::setObjectOwnership(log, QQmlEngine::JavaScriptOwnership);
 	emit newRecord(log);
 }

mix/ClientModel.h

@@ -72,6 +72,7 @@ struct TransactionSettings
 class RecordLogEntry: public QObject
 {
 	Q_OBJECT
+	Q_ENUMS(RecordType)
 	/// Recording index
 	Q_PROPERTY(unsigned recordIndex MEMBER m_recordIndex CONSTANT)
 	/// Human readable transaction bloack and transaction index
@@ -88,13 +89,20 @@ class RecordLogEntry: public QObject
 	Q_PROPERTY(QString returned MEMBER m_returned CONSTANT)
 	/// true if call, false if transaction
 	Q_PROPERTY(bool call MEMBER m_call CONSTANT)
-
+	/// @returns record type
+	Q_PROPERTY(RecordType type MEMBER m_type CONSTANT)
 
 public:
+	enum RecordType
+	{
+		Transaction,
+		Block
+	};
+
 	RecordLogEntry():
-		m_recordIndex(0), m_call(false) {}
-	RecordLogEntry(unsigned _recordIndex, QString _transactionIndex, QString _contract, QString _function, QString _value, QString _address, QString _returned, bool _call):
-		m_recordIndex(_recordIndex), m_transactionIndex(_transactionIndex), m_contract(_contract), m_function(_function), m_value(_value), m_address(_address), m_returned(_returned), m_call(_call) {}
+		m_recordIndex(0), m_call(false), m_type(RecordType::Transaction) {}
+	RecordLogEntry(unsigned _recordIndex, QString _transactionIndex, QString _contract, QString _function, QString _value, QString _address, QString _returned, bool _call, RecordType _type):
+		m_recordIndex(_recordIndex), m_transactionIndex(_transactionIndex), m_contract(_contract), m_function(_function), m_value(_value), m_address(_address), m_returned(_returned), m_call(_call), m_type(_type) {}
 
 private:
 	unsigned m_recordIndex;
@@ -105,6 +113,7 @@ private:
 	QString m_address;
 	QString m_returned;
 	bool m_call;
+	RecordType m_type;
 };
 
 /**
@@ -123,11 +132,12 @@ public:
 	Q_PROPERTY(bool mining MEMBER m_mining NOTIFY miningStateChanged)
 	/// @returns deployed contracts addresses
 	Q_PROPERTY(QVariantMap contractAddresses READ contractAddresses NOTIFY contractAddressesChanged)
+	// @returns the last block
+	Q_PROPERTY(RecordLogEntry* lastBlock READ lastBlock CONSTANT)
 	/// ethereum.js RPC request entry point
 	/// @param _message RPC request in Json format
 	/// @returns RPC response in Json format
 	Q_INVOKABLE QString apiCall(QString const& _message);
-
 	/// Simulate mining. Creates a new block
 	Q_INVOKABLE void mine();
 
@@ -139,6 +149,8 @@ public slots:
 	void setupState(QVariantMap _state);
 	/// Show the debugger for a specified record
 	Q_INVOKABLE void debugRecord(unsigned _index);
+	/// Show the debugger for an empty record
+	Q_INVOKABLE void emptyRecord();
 
 private slots:
 	/// Update UI with machine states result. Display a modal dialog.
@@ -177,6 +189,7 @@ signals:
 	void stateCleared();
 
 private:
+	RecordLogEntry* lastBlock() const;
 	QVariantMap contractAddresses() const;
 	void executeSequence(std::vector<TransactionSettings> const& _sequence, u256 _balance);
 	dev::Address deployContract(bytes const& _code, TransactionSettings const& _tr = TransactionSettings());
@@ -199,3 +212,5 @@ private:
 
 }
 }
+
+Q_DECLARE_METATYPE(dev::mix::RecordLogEntry*)

mix/CodeModel.cpp

@@ -56,6 +56,8 @@ CompiledContract::CompiledContract(const dev::solidity::CompilerStack& _compiler
 	m_contract.reset(new QContractDefinition(&contractDefinition));
 	QQmlEngine::setObjectOwnership(m_contract.get(), QQmlEngine::CppOwnership);
 	m_bytes = _compiler.getBytecode(_contractName.toStdString());
+	m_assemblyItems = _compiler.getRuntimeAssemblyItems(_contractName.toStdString());
+	m_constructorAssemblyItems = _compiler.getAssemblyItems(_contractName.toStdString());
 	dev::solidity::InterfaceHandler interfaceHandler;
 	m_contractInterface = QString::fromStdString(*interfaceHandler.getABIInterface(contractDefinition));
 	if (m_contractInterface.isEmpty())

mix/CodeModel.h

@@ -30,6 +30,7 @@
 #include <QHash>
 #include <libdevcore/Common.h>
 #include <libdevcore/Guards.h>
+#include <libevmcore/Assembly.h>
 
 class QTextDocument;
 
@@ -70,7 +71,7 @@ class CompiledContract: public QObject
 	Q_PROPERTY(QContractDefinition* contract READ contract)
 	Q_PROPERTY(QString contractInterface READ contractInterface CONSTANT)
 	Q_PROPERTY(QString codeHex READ codeHex CONSTANT)
-	Q_PROPERTY(QString documentId MEMBER m_documentId CONSTANT)
+	Q_PROPERTY(QString documentId READ documentId CONSTANT)
 
 public:
 	/// Successful compilation result constructor
@@ -86,6 +87,11 @@ public:
 	QString codeHex() const;
 	/// @returns contract definition in JSON format
 	QString contractInterface() const { return m_contractInterface; }
+	/// @return assebly item locations
+	eth::AssemblyItems const& assemblyItems() const { return m_assemblyItems; }
+	eth::AssemblyItems const& constructorAssemblyItems() const { return m_constructorAssemblyItems; }
+	/// @returns contract source Id
+	QString documentId() const { return m_documentId; }
 
 private:
 	uint m_sourceHash;
@@ -94,6 +100,8 @@ private:
 	dev::bytes m_bytes;
 	QString m_contractInterface;
 	QString m_documentId;
+	eth::AssemblyItems m_assemblyItems;
+	eth::AssemblyItems m_constructorAssemblyItems;
 
 	friend class CodeModel;
 };

mix/DebuggingStateWrapper.cpp

@@ -69,7 +69,7 @@ namespace
 	}
 }
 
-QCode* QMachineState::getHumanReadableCode(QObject* _owner, const bytes& _code)
+QCode* QMachineState::getHumanReadableCode(QObject* _owner, const Address& _address, const bytes& _code)
 {
 	QVariantList codeStr;
 	for (unsigned i = 0; i <= _code.size(); ++i)
@@ -96,7 +96,7 @@ QCode* QMachineState::getHumanReadableCode(QObject* _owner, const bytes& _code)
 			break;	// probably hit data segment
 		}
 	}
-	return new QCode(_owner, std::move(codeStr));
+	return new QCode(_owner, QString::fromStdString(toString(_address)), std::move(codeStr));
 }
 
 QBigInt* QMachineState::gasCost()
@@ -152,11 +152,6 @@ QVariantList QMachineState::levels()
 	return levelList;
 }
 
-QString QMachineState::address()
-{
-	return QString::fromStdString(toString(m_state.address));
-}
-
 QString QMachineState::instruction()
 {
 	return QString::fromStdString(dev::eth::instructionInfo(m_state.inst).name);

mix/DebuggingStateWrapper.h

@@ -53,6 +53,22 @@ private:
 	int m_processIndex;
 };
 
+
+class QSourceLocation: public QObject
+{
+	Q_OBJECT
+	Q_PROPERTY(int start MEMBER m_start CONSTANT)
+	Q_PROPERTY(int end MEMBER m_end CONSTANT)
+
+public:
+	QSourceLocation(QObject* _owner, int _start, int _end): QObject(_owner), m_start(_start), m_end(_end) {}
+
+private:
+	int m_start;
+	int m_end;
+};
+
+
 /**
  * @brief Shared container for lines
  */
@@ -60,12 +76,19 @@ class QCode: public QObject
 {
 	Q_OBJECT
 	Q_PROPERTY(QVariantList instructions MEMBER m_instructions CONSTANT)
+	Q_PROPERTY(QVariantList locations MEMBER m_locations CONSTANT)
+	Q_PROPERTY(QString address MEMBER m_address CONSTANT)
+	Q_PROPERTY(QString documentId MEMBER m_document CONSTANT)
 
 public:
-	QCode(QObject* _owner, QVariantList&& _instrunctions): QObject(_owner), m_instructions(_instrunctions) {}
+	QCode(QObject* _owner, QString const& _address, QVariantList&& _instrunctions): QObject(_owner), m_instructions(_instrunctions), m_address(_address) {}
+	void setLocations(QString const& _document, QVariantList&& _locations) { m_document = _document; m_locations = _locations; }
 
 private:
 	QVariantList m_instructions;
+	QString m_address;
+	QString m_document;
+	QVariantList m_locations;
 };
 
 /**
@@ -110,7 +133,6 @@ class QMachineState: public QObject
 	Q_PROPERTY(QBigInt* gasCost READ gasCost CONSTANT)
 	Q_PROPERTY(QBigInt* gas READ gas CONSTANT)
 	Q_PROPERTY(QString instruction READ instruction CONSTANT)
-	Q_PROPERTY(QString address READ address CONSTANT)
 	Q_PROPERTY(QStringList debugStack READ debugStack CONSTANT)
 	Q_PROPERTY(QStringList debugStorage READ debugStorage CONSTANT)
 	Q_PROPERTY(QVariantList debugMemory READ debugMemory CONSTANT)
@@ -133,8 +155,6 @@ public:
 	unsigned codeIndex() { return m_state.codeIndex; }
 	/// Get the call data id
 	unsigned dataIndex() { return m_state.dataIndex; }
-	/// Get address for call stack
-	QString address();
 	/// Get gas cost.
 	QBigInt* gasCost();
 	/// Get gas used.
@@ -158,7 +178,7 @@ public:
 	/// Set the current processed machine state.
 	void setState(MachineState _state) { m_state = _state;  }
 	/// Convert all machine states in human readable code.
-	static QCode* getHumanReadableCode(QObject* _owner, bytes const& _code);
+	static QCode* getHumanReadableCode(QObject* _owner, const Address& _address, const bytes& _code);
 	/// Convert call data into human readable form
 	static QCallData* getDebugCallData(QObject* _owner, bytes const& _data);
 

mix/FileIo.cpp

@@ -20,6 +20,9 @@
  * Ethereum IDE client.
  */
 
+#include <QDebug>
+#include <QDesktopServices>
+#include <QMimeDatabase>
 #include <QDirIterator>
 #include <QDir>
 #include <QFile>
@@ -37,6 +40,12 @@ using namespace dev;
 using namespace dev::crypto;
 using namespace dev::mix;
 
+
+void FileIo::openFileBrowser(QString const& _dir)
+{
+	QDesktopServices::openUrl(QUrl(_dir));
+}
+
 QString FileIo::pathFromUrl(QString const& _url)
 {
 	QUrl url(_url);
@@ -126,6 +135,7 @@ QStringList FileIo::makePackage(QString const& _deploymentFolder)
 	dev::RLPStream rlpStr;
 	int k = 1;
 	std::vector<bytes> files;
+	QMimeDatabase mimeDb;
 	for (auto item: deployDir.entryInfoList(QDir::Files))
 	{
 		QFile qFile(item.filePath());
@@ -137,7 +147,7 @@ QStringList FileIo::makePackage(QString const& _deploymentFolder)
 			std::string path = fileInfo.fileName() == "index.html" ? "/" : fileInfo.fileName().toStdString();
 			jsonValue["path"] = path; //TODO: Manage relative sub folder
 			jsonValue["file"] = "/" + fileInfo.fileName().toStdString();
-			jsonValue["contentType"] = "text/html"; //TODO: manage multiple content type
+			jsonValue["contentType"] = mimeDb.mimeTypeForFile(qFile.fileName()).name().toStdString();
 			QByteArray a = qFile.readAll();
 			bytes data = bytes(a.begin(), a.end());
 			files.push_back(data);

mix/FileIo.h

@@ -55,6 +55,8 @@ public:
 	Q_INVOKABLE bool fileExists(QString const& _url);
 	/// Compress a folder, @returns sha3 of the compressed file.
 	Q_INVOKABLE QStringList makePackage(QString const& _deploymentFolder);
+	/// Open a file browser
+	Q_INVOKABLE void openFileBrowser(QString const& _dir);
 
 private:
 	QString getHomePath() const;

mix/MachineStates.h

@@ -42,7 +42,6 @@ namespace mix
 	struct MachineState
 	{
 		uint64_t steps;
-		dev::Address address;
 		dev::u256 curPC;
 		dev::eth::Instruction inst;
 		dev::bigint newMemSize;
@@ -56,6 +55,15 @@ namespace mix
 		unsigned dataIndex;
 	};
 
+	/**
+	* @brief Executed conract code info
+	*/
+	struct MachineCode
+	{
+		dev::Address address;
+		bytes code;
+	};
+
 	/**
 	* @brief Store information about a machine states.
 	*/
@@ -65,7 +73,7 @@ namespace mix
 
 		std::vector<MachineState> machineStates;
 		std::vector<bytes> transactionData;
-		std::vector<bytes> executionCode;
+		std::vector<MachineCode> executionCode;
 		bytes returnValue;
 		dev::Address address;
 		dev::Address sender;
@@ -74,6 +82,7 @@ namespace mix
 		unsigned transactionIndex;
 
 		bool isCall() const { return transactionIndex == std::numeric_limits<unsigned>::max(); }
+		bool isConstructor() const { return !isCall() && !address; }
 	};
 
 	using ExecutionResults = std::vector<ExecutionResult>;

mix/MixClient.cpp

@@ -107,7 +107,7 @@ void MixClient::executeTransaction(Transaction const& _t, State& _state, bool _c
 	execution.setup(&rlp);
 	std::vector<MachineState> machineStates;
 	std::vector<unsigned> levels;
-	std::vector<bytes> codes;
+	std::vector<MachineCode> codes;
 	std::map<bytes const*, unsigned> codeIndexes;
 	std::vector<bytes> data;
 	std::map<bytesConstRef const*, unsigned> dataIndexes;
@@ -127,7 +127,7 @@ void MixClient::executeTransaction(Transaction const& _t, State& _state, bool _c
 			else
 			{
 				codeIndex = codes.size();
-				codes.push_back(ext.code);
+				codes.push_back(MachineCode({ext.myAddress, ext.code}));
 				codeIndexes[&ext.code] = codeIndex;
 			}
 			lastCode = &ext.code;
@@ -152,7 +152,7 @@ void MixClient::executeTransaction(Transaction const& _t, State& _state, bool _c
 		else
 			levels.resize(ext.depth);
 
-		machineStates.emplace_back(MachineState({steps, ext.myAddress, vm.curPC(), inst, newMemSize, vm.gas(),
+		machineStates.emplace_back(MachineState({steps, vm.curPC(), inst, newMemSize, vm.gas(),
 									  vm.stack(), vm.memory(), gasCost, ext.state().storage(ext.myAddress), levels, codeIndex, dataIndex}));
 	};
 
@@ -436,6 +436,12 @@ h256 MixClient::hashFromNumber(unsigned _number) const
 eth::BlockInfo MixClient::blockInfo(h256 _hash) const
 {
 	return BlockInfo(bc().block(_hash));
+
+}
+
+eth::BlockInfo MixClient::blockInfo() const
+{
+	return BlockInfo(bc().block());
 }
 
 eth::BlockDetails MixClient::blockDetails(h256 _hash) const

mix/MixClient.h

@@ -89,6 +89,8 @@ public:
 	eth::MineProgress miningProgress() const override;
 	std::pair<h256, u256> getWork() override { return std::pair<h256, u256>(); }
 	bool submitNonce(h256 const&) override { return false; }
+	/// @returns the last mined block information
+	eth::BlockInfo blockInfo() const;
 
 private:
 	void executeTransaction(dev::eth::Transaction const& _t, eth::State& _state, bool _call);

mix/qml/CodeEditorView.qml

@@ -7,6 +7,7 @@ Item {
 	id: codeEditorView
 	property string currentDocumentId: ""
 	signal documentEdit(string documentId)
+	signal breakpointsChanged(string documentId)
 
 	function getDocumentText(documentId) {
 		for (var i = 0; i < editorListModel.count; i++)	{
@@ -45,9 +46,51 @@ Item {
 			if (document.isContract)
 				codeModel.registerCodeChange(document.documentId, editor.getText());
 		});
+		editor.onBreakpointsChanged.connect(function() {
+			if (document.isContract)
+				breakpointsChanged(document.documentId);
+		});
 		editor.setText(data, document.syntaxMode);
 	}
 
+	function getEditor(documentId) {
+		for (var i = 0; i < editorListModel.count; i++)
+			if (editorListModel.get(i).documentId === documentId)
+				return editors.itemAt(i).item;
+		return null;
+	}
+
+	function highlightExecution(documentId, location) {
+		var editor = getEditor(documentId);
+		if (editor)
+			editor.highlightExecution(location);
+	}
+
+	function editingContract() {
+		for (var i = 0; i < editorListModel.count; i++)
+			if (editorListModel.get(i).documentId === currentDocumentId)
+				return editorListModel.get(i).isContract;
+		return false;
+	}
+
+	function getBreakpoints() {
+		var bpMap = {};
+		for (var i = 0; i < editorListModel.count; i++)  {
+			var documentId = editorListModel.get(i).documentId;
+			var editor = editors.itemAt(i).item;
+			if (editor) {
+				bpMap[documentId] = editor.getBreakpoints();
+			}
+		}
+		return bpMap;
+	}
+
+	function toggleBreakpoint() {
+		var editor = getEditor(currentDocumentId);
+		if (editor)
+			editor.toggleBreakpoint();
+	}
+
 	Component.onCompleted: projectModel.codeEditor = codeEditorView;
 
 	Connections {

mix/qml/Debugger.qml

@@ -11,7 +11,10 @@ import "."
 Rectangle {
 	id: debugPanel
 
-	property alias transactionLog : transactionLog
+	property alias transactionLog: transactionLog
+	signal debugExecuteLocation(string documentId, var location)
+	property string compilationErrorMessage
+	property bool assemblyMode: false
 
 	objectName: "debugPanel"
 	color: "#ededed"
@@ -23,29 +26,44 @@ Rectangle {
 			forceActiveFocus();
 	}
 
+	onAssemblyModeChanged:
+	{
+		Debugger.updateMode();
+	}
+
+	function displayCompilationErrorIfAny()
+	{
+		debugScrollArea.visible = false;
+		compilationErrorArea.visible = true;
+		machineStates.visible = false;
+		var errorInfo = ErrorLocationFormater.extractErrorInfo(compilationErrorMessage, false);
+		errorLocation.text = errorInfo.errorLocation;
+		errorDetail.text = errorInfo.errorDetail;
+		errorLine.text = errorInfo.errorLine;
+	}
+
 	function update(data, giveFocus)
 	{
-		if (statusPane && codeModel.hasContract)
+		if (data === null)
+			Debugger.init(null);
+		else if (data.states.length === 0)
+			Debugger.init(null);
+		else if (codeModel.hasContract)
 		{
 			Debugger.init(data);
 			debugScrollArea.visible = true;
 			compilationErrorArea.visible = false;
 			machineStates.visible = true;
 		}
-		else
-		{
-			debugScrollArea.visible = false;
-			compilationErrorArea.visible = true;
-			machineStates.visible = false;
-			var errorInfo = ErrorLocationFormater.extractErrorInfo(statusPane.result.compilerMessage, false);
-			errorLocation.text = errorInfo.errorLocation;
-			errorDetail.text = errorInfo.errorDetail;
-			errorLine.text = errorInfo.errorLine;
-		}
 		if (giveFocus)
 			forceActiveFocus();
 	}
 
+	function setBreakpoints(bp)
+	{
+		Debugger.setBreakpoints(bp);
+	}
+
 	Connections {
 		target: clientModel
 		onDebugDataReady:  {
@@ -55,7 +73,13 @@ Rectangle {
 
 	Connections {
 		target: codeModel
-		onCompilationComplete: update(null, false);
+		onCompilationComplete: {
+			debugPanel.compilationErrorMessage = "";
+		}
+
+		onCompilationError: {
+			debugPanel.compilationErrorMessage = _error;
+		}
 	}
 
 	Settings {
@@ -73,7 +97,7 @@ Rectangle {
 		visible: false;
 		id: compilationErrorArea
 		width: parent.width - 20
-		height: 500
+		height: 600
 		color: "#ededed"
 		anchors.left: parent.left
 		anchors.top: parent.top
@@ -82,7 +106,20 @@ Rectangle {
 		{
 			width: parent.width
 			anchors.top: parent.top
-			spacing: 25
+			spacing: 15
+			Rectangle
+			{
+				height: 15
+				Button {
+					text: qsTr("Back to Debugger")
+					onClicked: {
+						debugScrollArea.visible = true;
+						compilationErrorArea.visible = false;
+						machineStates.visible = true;
+					}
+				}
+			}
+
 			RowLayout
 			{
 				height: 100
@@ -173,11 +210,23 @@ Rectangle {
 						anchors.bottom: parent.bottom
 						anchors.left: parent.left
 						color: "transparent"
-						width: stateListContainer.width
+						width: parent.width * 0.4
 						RowLayout {
 							anchors.horizontalCenter: parent.horizontalCenter
 							id: jumpButtons
 							spacing: 3
+							StepActionImage
+							{
+								id: runBackAction;
+								enabledStateImg: "qrc:/qml/img/jumpoutback.png"
+								disableStateImg: "qrc:/qml/img/jumpoutbackdisabled.png"
+								onClicked: Debugger.runBack()
+								width: 30
+								height: 30
+								buttonShortcut: "Ctrl+Shift+F5"
+								buttonTooltip: qsTr("Run Back")
+							}
+
 							StepActionImage
 							{
 								id: jumpOutBackAction;
@@ -249,6 +298,20 @@ Rectangle {
 								buttonShortcut: "Shift+F11"
 								buttonTooltip: qsTr("Step Out Forward")
 							}
+
+							StepActionImage
+							{
+								id: runForwardAction
+								enabledStateImg: "qrc:/qml/img/jumpoutforward.png"
+								disableStateImg: "qrc:/qml/img/jumpoutforwarddisabled.png"
+								onClicked: Debugger.runForward()
+								width: 30
+								height: 30
+								buttonShortcut: "Ctrl+F5"
+								buttonTooltip: qsTr("Run Forward")
+							}
+
+
 						}
 					}
 
@@ -256,7 +319,7 @@ Rectangle {
 						anchors.top: parent.top
 						anchors.bottom: parent.bottom
 						anchors.right: parent.right
-						width: debugInfoContainer.width
+						width: parent.width * 0.6
 						color: "transparent"
 						Slider {
 							id: statesSlider
@@ -291,6 +354,7 @@ Rectangle {
 					height: 405
 					implicitHeight: 405
 					color: "transparent"
+					visible: assemblyMode
 
 					Rectangle
 					{

mix/qml/DeploymentDialog.qml

@@ -12,18 +12,20 @@ import "."
 
 
 Window {
+
 	id: modalDeploymentDialog
 	modality: Qt.ApplicationModal
-	width: 600
+	width: 930
 	height: 350
 	visible: false
 	property alias applicationUrlEth: applicationUrlEth.text
 	property alias applicationUrlHttp: applicationUrlHttp.text
-	property string urlHintContract: "c83d3e22645fb015d02043a744921cc2f828c64d"
+	property string urlHintContract: "c83d3e22645fb015d02043a744921cc2f828c64d" /* TODO: replace with the good address */
 	property string packageHash
 	property alias packageBase64: base64Value.text
-	property string eth: "afb7cdbd076674fd2c67f8a66518e3145b184ae4";
-	property string wallet: "c83d3e22645fb015d02043a744921cc2f828c64d";
+	property string eth: "4c3f7330690ed3657d3fa20fe5717b84010528ae"; /* TODO: replace with the good address */
+	property string currentAccount
+	property alias gasToUse: gasToUseInput.text
 
 	color: Style.generic.layout.backgroundColor
 
@@ -37,6 +39,59 @@ Window {
 		modalDeploymentDialog.setX((Screen.width - width) / 2);
 		modalDeploymentDialog.setY((Screen.height - height) / 2);
 		visible = true;
+
+		var requests = [{
+							//accounts
+							jsonrpc: "2.0",
+							method: "eth_accounts",
+							params: null,
+							id: 0
+						}];
+
+		TransactionHelper.rpcCall(requests, function(arg1, arg2)
+		{
+			modelAccounts.clear();
+			var ids = JSON.parse(arg2)[0].result;
+			requests = [];
+			for (var k in ids)
+			{
+				modelAccounts.append({ "id": ids[k] })
+				requests.push({
+								  //accounts
+								  jsonrpc: "2.0",
+								  method: "eth_balanceAt",
+								  params: [ids[k]],
+								  id: k
+							  });
+			}
+
+			if (ids.length > 0)
+				currentAccount = modelAccounts.get(0).id;
+
+			TransactionHelper.rpcCall(requests, function (request, response){
+				var balanceRet = JSON.parse(response);
+				for (var k in balanceRet)
+				{
+					var ether = QEtherHelper.createEther(balanceRet[k].result, QEther.Wei);
+					comboAccounts.balances.push(ether.format());
+				}
+				balance.text = comboAccounts.balances[0];
+			});
+		});
+	}
+
+	function stopForInputError(inError)
+	{
+		errorDialog.text = "";
+		if (inError.length > 0)
+		{
+			errorDialog.text = qsTr("The length of a string cannot exceed 32 characters.\nPlease verify the following value(s):\n\n")
+			for (var k in inError)
+				errorDialog.text += inError[k] + "\n";
+			errorDialog.open();
+			return true;
+		}
+		return false;
 	}
 
 	function pad(h)
@@ -49,6 +104,52 @@ Window {
 		return h;
 	}
 
+	function waitForTrCountToIncrement(callBack)
+	{
+		poolLog.callBack = callBack;
+		poolLog.k = -1;
+		poolLog.elapsed = 0;
+		poolLog.start();
+	}
+
+	Timer
+	{
+		id: poolLog
+		property var callBack
+		property int k: -1
+		property int elapsed
+		interval: 500
+		running: false
+		repeat: true
+		onTriggered: {
+			elapsed += interval;
+			var requests = [];
+			var jsonRpcRequestId = 0;
+			requests.push({
+							  jsonrpc: "2.0",
+							  method: "eth_countAt",
+							  params: [ currentAccount ],
+							  id: jsonRpcRequestId++
+						  });
+			TransactionHelper.rpcCall(requests, function (httpRequest, response){
+				response = response.replace(/,0+/, ''); // ==> result:27,00000000
+				var count = JSON.parse(response)[0].result
+				if (k < parseInt(count) && k > 0)
+				{
+					stop();
+					callBack(1);
+				}
+				else if (elapsed > 25000)
+				{
+					stop();
+					callBack(-1);
+				}
+				else
+					k = parseInt(JSON.parse(response)[0].result);
+			})
+		}
+	}
+
 	Rectangle
 	{
 		anchors.fill : parent
@@ -60,15 +161,63 @@ Window {
 			anchors.top: parent.top
 			anchors.left: parent.left
 			width: parent.width
+			DefaultLabel
+			{
+				text: qsTr("Account used to deploy:")
+			}
+
+			Rectangle
+			{
+				width: 300
+				height: 25
+				color: "transparent"
+				ComboBox {
+					id: comboAccounts
+					property var balances: []
+					onCurrentIndexChanged : {
+						if (modelAccounts.count > 0)
+						{
+							currentAccount = modelAccounts.get(currentIndex).id;
+							balance.text = balances[currentIndex];
+						}
+					}
+					model: ListModel {
+						id: modelAccounts
+					}
+				}
+
+				DefaultLabel
+				{
+					anchors.verticalCenter: parent.verticalCenter
+					anchors.left: comboAccounts.right
+					anchors.leftMargin: 20
+					id: balance;
+				}
+			}
+
+
 			DefaultLabel
 			{
 				text: qsTr("Ethereum Application URL: ")
 			}
 
-			DefaultTextField
+			Rectangle
 			{
 				Layout.fillWidth: true
-				id: applicationUrlEth
+				height: 25
+				color: "transparent"
+				DefaultTextField
+				{
+					width: 350
+					id: applicationUrlEth
+				}
+
+				DefaultLabel
+				{
+					anchors.verticalCenter: parent.verticalCenter;
+					anchors.left: applicationUrlEth.right
+					text: "/" + projectModel.projectTitle
+				}
 			}
 
 			DefaultLabel
@@ -82,6 +231,18 @@ Window {
 				id: applicationUrlHttp
 			}
 
+			DefaultLabel
+			{
+				text: qsTr("Amount of gas to use for each contract deployment: ")
+			}
+
+			DefaultTextField
+			{
+				text: "20000"
+				Layout.fillWidth: true
+				id: gasToUseInput
+			}
+
 			DefaultLabel
 			{
 				text: qsTr("Package (Base64): ")
@@ -103,16 +264,47 @@ Window {
 			icon: StandardIcon.Warning
 		}
 
+		MessageDialog {
+			id: errorDialog
+			standardButtons: StandardButton.Ok
+			icon: StandardIcon.Error
+		}
+
 		RowLayout
 		{
 			anchors.bottom: parent.bottom
 			anchors.right: parent.right;
 			anchors.bottomMargin: 10
 			Button {
-				text: qsTr("Deploy to Ethereum");
+				text: qsTr("Deploy contract / Package resources");
 				tooltip: qsTr("Deploy contract and package resources files.")
 				onClicked: {
-					deployWarningDialog.open();
+					var inError = [];
+					var ethUrl = ProjectModelCode.formatAppUrl(applicationUrlEth.text);
+					for (var k in ethUrl)
+					{
+						if (ethUrl[k].length > 32)
+							inError.push(qsTr("Member too long: " + ethUrl[k]) + "\n");
+					}
+					if (!stopForInputError(inError))
+						deployWarningDialog.open();
+				}
+			}
+
+			Button {
+				text: qsTr("Package resources only");
+				tooltip: qsTr("Package resources files.")
+				enabled: Object.keys(projectModel.deploymentAddresses).length > 0
+				onClicked: {
+					ProjectModelCode.startDeployProject(false);
+				}
+			}
+
+			Button {
+				text: qsTr("Open Package Directory");
+				enabled: projectModel.deploymentDir !== ""
+				onClicked: {
+					fileIo.openFileBrowser(projectModel.deploymentDir);
 				}
 			}
 
@@ -123,10 +315,14 @@ Window {
 					if (applicationUrlHttp.text === "" || deploymentDialog.packageHash === "")
 					{
 						deployDialog.title = text;
-						deployDialog.text = qsTr("Please provide the link where the resources are stored and ensure the package is aleary built using the deployment step. ")
+						deployDialog.text = qsTr("Please provide the link where the resources are stored and ensure the package is aleary built using the deployment step.")
 						deployDialog.open();
+						return;
 					}
-					else
+					var inError = [];
+					if (applicationUrlHttp.text.length > 32)
+						inError.push(qsTr(applicationUrlHttp.text));
+					if (!stopForInputError(inError))
 						ProjectModelCode.registerToUrlHint();
 				}
 			}
@@ -135,98 +331,6 @@ Window {
 				text: qsTr("Close");
 				onClicked: close();
 			}
-
-			Button {
-				text: qsTr("Check Ownership");
-				visible : false
-				onClicked: {
-					var requests = [];
-					var ethStr = QEtherHelper.createString("wallet");
-
-					var ethHash = QEtherHelper.createHash(eth);
-
-					requests.push({ //owner
-					jsonrpc: "2.0",
-					method: "eth_call",
-					params: [ { "to": '0x' + modalDeploymentDialog.eth, "data": "0xec7b9200" + ethStr.encodeValueAsString() } ],
-					id: 3
-				});
-
-				requests.push({ //register
-					jsonrpc: "2.0",
-					method: "eth_call",
-					params: [ { "to":  '0x' + modalDeploymentDialog.eth, "data": "0x6be16bed" + ethStr.encodeValueAsString() } ],
-					id: 4
-				});
-
-					var jsonRpcUrl = "http://localhost:8080";
-					var rpcRequest = JSON.stringify(requests);
-					var httpRequest = new XMLHttpRequest();
-					httpRequest.open("POST", jsonRpcUrl, true);
-					httpRequest.setRequestHeader("Content-type", "application/json");
-					httpRequest.setRequestHeader("Content-length", rpcRequest.length);
-					httpRequest.setRequestHeader("Connection", "close");
-					httpRequest.onreadystatechange = function() {
-						if (httpRequest.readyState === XMLHttpRequest.DONE) {
-							if (httpRequest.status === 200) {
-								console.log(httpRequest.responseText);
-							} else {
-								var errorText = qsTr("path registration failed ") + httpRequest.status;
-								console.log(errorText);
-							}
-						}
-					}
-					httpRequest.send(rpcRequest);
-				}
-			}
-
-
-			Button {
-				text: qsTr("Generate registrar init");
-				visible: false
-				onClicked: {
-					console.log("registering eth/wallet")
-					var jsonRpcRequestId = 0;
-
-					var requests = [];
-
-					var walletStr = QEtherHelper.createString("wallet");
-
-					requests.push({ //reserve
-									  jsonrpc: "2.0",
-									  method: "eth_transact",
-									  params: [ { "to": '0x' + modalDeploymentDialog.eth, "data": "0x1c83171b" + walletStr.encodeValueAsString() } ],
-									  id: jsonRpcRequestId++
-								  });
-
-
-					requests.push({ //setRegister
-									  jsonrpc: "2.0",
-									  method: "eth_transact",
-									  params: [ { "to": '0x' + modalDeploymentDialog.eth, "data": "0x96077307" + walletStr.encodeValueAsString() + pad(wallet) } ],
-									  id: jsonRpcRequestId++
-								  });
-
-					var jsonRpcUrl = "http://localhost:8080";
-					var rpcRequest = JSON.stringify(requests);
-					var httpRequest = new XMLHttpRequest();
-					httpRequest.open("POST", jsonRpcUrl, true);
-					httpRequest.setRequestHeader("Content-type", "application/json");
-					httpRequest.setRequestHeader("Content-length", rpcRequest.length);
-					httpRequest.setRequestHeader("Connection", "close");
-					httpRequest.onreadystatechange = function() {
-						if (httpRequest.readyState === XMLHttpRequest.DONE) {
-							if (httpRequest.status === 200) {
-								console.log(httpRequest.responseText);
-							} else {
-								var errorText = qsTr("path registration failed ") + httpRequest.status;
-								console.log(errorText);
-							}
-						}
-					}
-					httpRequest.send(rpcRequest);
-				}
-			}
 		}
 	}
 }

mix/qml/FilesSection.qml

@@ -6,17 +6,19 @@ import QtQuick.Controls.Styles 1.3
 import "."
 
 
-ColumnLayout {
+Rectangle
+{
+	Layout.fillWidth: true
+	Layout.minimumHeight: hiddenHeightTopLevel()
+	height: hiddenHeightTopLevel()
+	Layout.maximumHeight: hiddenHeightTopLevel()
 	id: wrapperItem
 	signal documentSelected(string doc, string groupName)
 	property alias model: filesList.model
 	property string sectionName;
 	property variant selManager;
-	Layout.fillWidth: true
-	Layout.minimumHeight: hiddenHeightTopLevel()
-	height: hiddenHeightTopLevel()
-	Layout.maximumHeight: hiddenHeightTopLevel()
-	spacing: 0
+	property int index;
+	color: index % 2 === 0 ? "transparent" : ProjectFilesStyle.title.background
 
 	function hiddenHeightTopLevel()
 	{
@@ -48,196 +50,203 @@ ColumnLayout {
 			model.remove(i);
 	}
 
-	SourceSansProRegular
-	{
-		id: fileNameFont
-	}
-
-	SourceSansProBold
-	{
-		id: boldFont
-	}
+	ColumnLayout {
+		anchors.fill: parent
+		spacing: 0
 
-	RowLayout
-	{
-		anchors.top: parent.top
-		id: rowCol
-		width: parent.width
-		height: ProjectFilesStyle.documentsList.height
-
-		Image {
-			source: "qrc:/qml/img/opentriangleindicator_filesproject.png"
-			width: 15
-			sourceSize.width: 12
-			id: imgArrow
-			anchors.right: section.left
-			anchors.rightMargin: 8
-			anchors.top: parent.top
-			anchors.topMargin: 6
+		SourceSansProRegular
+		{
+			id: fileNameFont
 		}
 
-		Text
+		SourceSansProBold
 		{
-			id: section
-			text: sectionName
-			anchors.left: parent.left
-			anchors.leftMargin: ProjectFilesStyle.general.leftMargin
-			color: ProjectFilesStyle.documentsList.sectionColor
-			font.family: boldFont.name
-			font.pointSize: ProjectFilesStyle.documentsList.sectionFontSize
-			states: [
-				State {
-					name: "hidden"
-					PropertyChanges { target: filesList; visible: false; }
-					PropertyChanges { target: rowCol; Layout.minimumHeight: ProjectFilesStyle.documentsList.height; Layout.maximumHeight: ProjectFilesStyle.documentsList.height; height: ProjectFilesStyle.documentsList.height; }
-					PropertyChanges { target: imgArrow; source: "qrc:/qml/img/closedtriangleindicator_filesproject.png" }
-				}
-			]
+			id: boldFont
 		}
 
-		MouseArea {
-			id: titleMouseArea
-			anchors.fill: parent
-			hoverEnabled: true
-			z: 2
-			onClicked: {
-				if (section.state === "hidden")
-					section.state = "";
-				else
-					section.state = "hidden";
+		RowLayout
+		{
+			anchors.top: parent.top
+			id: rowCol
+			height: ProjectFilesStyle.documentsList.height
+			Layout.fillWidth: true
+
+
+			Image {
+				source: "qrc:/qml/img/opentriangleindicator_filesproject.png"
+				width: 15
+				sourceSize.width: 12
+				id: imgArrow
+				anchors.right: section.left
+				anchors.rightMargin: 8
+				anchors.top: parent.top
+				anchors.topMargin: 10
+			}
+
+			Text
+			{
+				id: section
+				text: sectionName
+				anchors.left: parent.left
+				anchors.leftMargin: ProjectFilesStyle.general.leftMargin
+				color: ProjectFilesStyle.documentsList.sectionColor
+				font.family: boldFont.name
+				font.pointSize: ProjectFilesStyle.documentsList.sectionFontSize
+				states: [
+					State {
+						name: "hidden"
+						PropertyChanges { target: filesList; visible: false; }
+						PropertyChanges { target: rowCol; Layout.minimumHeight: ProjectFilesStyle.documentsList.height; Layout.maximumHeight: ProjectFilesStyle.documentsList.height; height: ProjectFilesStyle.documentsList.height; }
+						PropertyChanges { target: imgArrow; source: "qrc:/qml/img/closedtriangleindicator_filesproject.png" }
+					}
+				]
+			}
+
+			MouseArea {
+				id: titleMouseArea
+				anchors.fill: parent
+				hoverEnabled: true
+				z: 2
+				onClicked: {
+					if (section.state === "hidden")
+						section.state = "";
+					else
+						section.state = "hidden";
+				}
 			}
 		}
-	}
 
-	ColumnLayout {
-		height: wrapperItem.hiddenHeightRepeater()
-		Layout.minimumHeight: wrapperItem.hiddenHeightRepeater()
-		Layout.preferredHeight: wrapperItem.hiddenHeightRepeater()
-		Layout.maximumHeight: wrapperItem.hiddenHeightRepeater()
-		width: parent.width
-		visible: section.state !== "hidden"
-		spacing: 0
-		Repeater
-		{
-			id: filesList
+		ColumnLayout {
+			height: wrapperItem.hiddenHeightRepeater()
+			Layout.minimumHeight: wrapperItem.hiddenHeightRepeater()
+			Layout.preferredHeight: wrapperItem.hiddenHeightRepeater()
+			Layout.maximumHeight: wrapperItem.hiddenHeightRepeater()
+			width: parent.width
 			visible: section.state !== "hidden"
-			Rectangle
+			spacing: 0
+
+			Repeater
 			{
+				id: filesList
 				visible: section.state !== "hidden"
-				id: rootItem
-				Layout.fillWidth: true
-				Layout.minimumHeight: wrapperItem.hiddenHeightElement()
-				Layout.preferredHeight: wrapperItem.hiddenHeightElement()
-				Layout.maximumHeight: wrapperItem.hiddenHeightElement()
-				height: wrapperItem.hiddenHeightElement()
-				color: isSelected ? ProjectFilesStyle.documentsList.highlightColor : ProjectFilesStyle.documentsList.background
-				property bool isSelected
-				property bool renameMode
-				Text {
-					id: nameText
-					height: parent.height
-					visible: !renameMode
-					color: rootItem.isSelected ? ProjectFilesStyle.documentsList.selectedColor : ProjectFilesStyle.documentsList.color
-					text: name;
-					font.family: fileNameFont.name
-					font.pointSize: ProjectFilesStyle.documentsList.fontSize
-					anchors.verticalCenter: parent.verticalCenter
-					verticalAlignment:  Text.AlignVCenter
-					anchors.left: parent.left
-					anchors.leftMargin: ProjectFilesStyle.general.leftMargin + 2
-					width: parent.width
-					Connections
-					{
-						target: selManager
-						onSelected: {
-							if (groupName != sectionName)
-								rootItem.isSelected = false;
-							else if (doc === documentId)
-								rootItem.isSelected = true;
-							else
-								rootItem.isSelected = false;
+				Rectangle
+				{
+					visible: section.state !== "hidden"
+					id: rootItem
+					Layout.fillWidth: true
+					Layout.minimumHeight: wrapperItem.hiddenHeightElement()
+					Layout.preferredHeight: wrapperItem.hiddenHeightElement()
+					Layout.maximumHeight: wrapperItem.hiddenHeightElement()
+					height: wrapperItem.hiddenHeightElement()
+					color: isSelected ? ProjectFilesStyle.documentsList.highlightColor : "transparent"
+					property bool isSelected
+					property bool renameMode
+					Text {
+						id: nameText
+						height: parent.height
+						visible: !renameMode
+						color: rootItem.isSelected ? ProjectFilesStyle.documentsList.selectedColor : ProjectFilesStyle.documentsList.color
+						text: name;
+						font.family: fileNameFont.name
+						font.pointSize: ProjectFilesStyle.documentsList.fontSize
+						anchors.verticalCenter: parent.verticalCenter
+						verticalAlignment:  Text.AlignVCenter
+						anchors.left: parent.left
+						anchors.leftMargin: ProjectFilesStyle.general.leftMargin + 2
+						width: parent.width
+						Connections
+						{
+							target: selManager
+							onSelected: {
+								if (groupName != sectionName)
+									rootItem.isSelected = false;
+								else if (doc === documentId)
+									rootItem.isSelected = true;
+								else
+									rootItem.isSelected = false;
 
-							if (rootItem.isSelected && section.state === "hidden")
-								section.state = "";
+								if (rootItem.isSelected && section.state === "hidden")
+									section.state = "";
+							}
 						}
 					}
-				}
 
-				TextInput {
-					id: textInput
-					text: nameText.text
-					visible: renameMode
-					anchors.verticalCenter: parent.verticalCenter
-					anchors.left: parent.left
-					anchors.leftMargin: ProjectFilesStyle.general.leftMargin
-					MouseArea {
-						id: textMouseArea
-						anchors.fill: parent
-						hoverEnabled: true
-						z: 2
-						onClicked: {
-							textInput.forceActiveFocus();
+					TextInput {
+						id: textInput
+						text: nameText.text
+						visible: renameMode
+						anchors.verticalCenter: parent.verticalCenter
+						anchors.left: parent.left
+						anchors.leftMargin: ProjectFilesStyle.general.leftMargin
+						MouseArea {
+							id: textMouseArea
+							anchors.fill: parent
+							hoverEnabled: true
+							z: 2
+							onClicked: {
+								textInput.forceActiveFocus();
+							}
 						}
-					}
 
-					onVisibleChanged: {
-						if (visible) {
-							selectAll();
-							forceActiveFocus();
+						onVisibleChanged: {
+							if (visible) {
+								selectAll();
+								forceActiveFocus();
+							}
 						}
-					}
 
-					onAccepted: close(true);
-					onCursorVisibleChanged: {
-						if (!cursorVisible)
-							close(false);
-					}
-					onFocusChanged: {
-						if (!focus)
-							close(false);
-					}
-					function close(accept) {
-						rootItem.renameMode = false;
-						if (accept)
-						{
-							var i = getDocumentIndex(documentId);
-							projectModel.renameDocument(documentId, textInput.text);
-							wrapperItem.model.set(i, projectModel.getDocument(documentId));
+						onAccepted: close(true);
+						onCursorVisibleChanged: {
+							if (!cursorVisible)
+								close(false);
+						}
+						onFocusChanged: {
+							if (!focus)
+								close(false);
+						}
+						function close(accept) {
+							rootItem.renameMode = false;
+							if (accept)
+							{
+								var i = getDocumentIndex(documentId);
+								projectModel.renameDocument(documentId, textInput.text);
+								wrapperItem.model.set(i, projectModel.getDocument(documentId));
+							}
 						}
 					}
-				}
 
-				MouseArea {
-					id: mouseArea
-					z: 1
-					hoverEnabled: false
-					anchors.fill: parent
-					acceptedButtons: Qt.LeftButton | Qt.RightButton
-					onClicked:{
-						if (mouse.button === Qt.RightButton && !isContract)
-							contextMenu.popup();
-						else if (mouse.button === Qt.LeftButton)
-						{
-							rootItem.isSelected = true;
-							projectModel.openDocument(documentId);
-							documentSelected(documentId, groupName);
+					MouseArea {
+						id: mouseArea
+						z: 1
+						hoverEnabled: false
+						anchors.fill: parent
+						acceptedButtons: Qt.LeftButton | Qt.RightButton
+						onClicked:{
+							if (mouse.button === Qt.RightButton && !isContract)
+								contextMenu.popup();
+							else if (mouse.button === Qt.LeftButton)
+							{
+								rootItem.isSelected = true;
+								projectModel.openDocument(documentId);
+								documentSelected(documentId, groupName);
+							}
 						}
 					}
-				}
 
-				Menu {
-					id: contextMenu
-					MenuItem {
-						text: qsTr("Rename")
-						onTriggered: {
-							rootItem.renameMode = true;
+					Menu {
+						id: contextMenu
+						MenuItem {
+							text: qsTr("Rename")
+							onTriggered: {
+								rootItem.renameMode = true;
+							}
 						}
-					}
-					MenuItem {
-						text: qsTr("Delete")
-						onTriggered: {
-							projectModel.removeDocument(documentId);
-							wrapperItem.removeDocument(documentId);
+						MenuItem {
+							text: qsTr("Delete")
+							onTriggered: {
+								projectModel.removeDocument(documentId);
+								wrapperItem.removeDocument(documentId);
+							}
 						}
 					}
 				}
@@ -245,4 +254,3 @@ ColumnLayout {
 		}
 	}
 }
-

mix/qml/MainContent.qml

@@ -26,6 +26,7 @@ Rectangle {
 	property alias projectViewVisible: projectList.visible
 	property alias runOnProjectLoad: mainSettings.runOnProjectLoad
 	property alias rightPane: rightView
+	property alias codeEditor: codeEditor
 	property bool webViewHorizontal: codeWebSplitter.orientation === Qt.Vertical //vertical splitter positions elements vertically, splits screen horizontally
 	property bool firstCompile: true
 
@@ -40,6 +41,20 @@ Rectangle {
 		}
 	}
 
+	Connections {
+		target: rightView
+		onDebugExecuteLocation: {
+			codeEditor.highlightExecution(documentId, location);
+		}
+	}
+
+	Connections {
+		target: codeEditor
+		onBreakpointsChanged: {
+			rightPane.setBreakpoints(codeEditor.getBreakpoints());
+		}
+	}
+
 	function startQuickDebugging()
 	{
 		ensureRightView();
@@ -75,6 +90,17 @@ Rectangle {
 		codeWebSplitter.orientation = (codeWebSplitter.orientation === Qt.Vertical ? Qt.Horizontal : Qt.Vertical);
 	}
 
+	//TODO: move this to debugger.js after refactoring, introduce events
+	function toggleBreakpoint() {
+		codeEditor.toggleBreakpoint();
+	}
+
+	function displayCompilationErrorIfAny()
+	{
+		rightView.visible = true;
+		rightView.displayCompilationErrorIfAny();
+	}
+
 	CodeEditorExtensionManager {
 		headerView: headerPaneTabs;
 	}
@@ -168,6 +194,7 @@ Rectangle {
 						anchors.fill: parent
 						orientation: Qt.Vertical
 						CodeEditorView {
+							id: codeEditor
 							height: parent.height * 0.6
 							anchors.top: parent.top
 							Layout.fillWidth: true
@@ -196,7 +223,3 @@ Rectangle {
 		}
 	}
 }
-
-
-
-

mix/qml/ProjectFilesStyle.qml

@@ -25,7 +25,7 @@ QtObject {
 		property string sectionColor: "#808080"
 		property string selectedColor: "white"
 		property string highlightColor: "#4a90e2"
-		property int height: 25
+		property int height: 35
 		property int fileNameHeight: 30
 		property int fontSize: absoluteSize(2)// 13
 		property int sectionFontSize: absoluteSize(2)// 13

mix/qml/ProjectList.qml

@@ -26,11 +26,9 @@ Item {
 			Image {
 				id: projectIcon
 				source: "qrc:/qml/img/dappProjectIcon.png"
-				//sourceSize.height: 32
 				anchors.right: projectTitle.left
 				anchors.verticalCenter: parent.verticalCenter
 				anchors.rightMargin: 6
-				//anchors.centerIn: parent
 				fillMode: Image.PreserveAspectFit
 				width: 32
 				height: 32
@@ -65,7 +63,7 @@ Item {
 		Rectangle
 		{
 			Layout.fillWidth: true
-			height: 10
+			height: 3
 			color: ProjectFilesStyle.documentsList.background
 		}
 
@@ -82,14 +80,24 @@ Item {
 				anchors.top: parent.top
 				width: parent.width
 				spacing: 0
-
 				Repeater {
 					model: [qsTr("Contracts"), qsTr("Javascript"), qsTr("Web Pages"), qsTr("Styles"), qsTr("Images"), qsTr("Misc")];
 					signal selected(string doc, string groupName)
+					property int incr: -1;
 					id: sectionRepeater
 					FilesSection
 					{
+						id: section;
 						sectionName: modelData
+						index:
+						{
+							for (var k in sectionRepeater.model)
+							{
+								if (sectionRepeater.model[k] === modelData)
+									return k;
+							}
+						}
+
 						model: sectionModel
 						selManager: sectionRepeater
 
@@ -119,7 +127,7 @@ Item {
 											ci++;
 										}
 									}
-								}	
+								}
 							}
 						}
 
@@ -170,10 +178,10 @@ Item {
 									projectModel.openDocument(newDoc.documentId);
 									sectionRepeater.selected(newDoc.documentId, modelData);
 								}
-
 							}
 						}
 					}
+
 				}
 			}
 		}

mix/qml/ProjectModel.qml

@@ -7,6 +7,7 @@ import Qt.labs.settings 1.0
 import "js/ProjectModel.js" as ProjectModelCode
 
 Item {
+
 	id: projectModel
 
 	signal projectClosed
@@ -33,6 +34,7 @@ Item {
 	property string projectTitle: ""
 	property string currentDocumentId: ""
 	property var deploymentAddresses: []
+	property string deploymentDir
 	property var listModel: projectListModel
 	property var stateListModel: projectStateListModel.model
 	property CodeEditorView codeEditor: null
@@ -57,6 +59,7 @@ Item {
 	function addExistingFiles(paths) { ProjectModelCode.doAddExistingFiles(paths); }
 	function deployProject() { ProjectModelCode.deployProject(false); }
 	function registerToUrlHint() { ProjectModelCode.registerToUrlHint(); }
+	function formatAppUrl() { ProjectModelCode.formatAppUrl(url); }
 
 	Connections {
 		target: appContext
@@ -93,28 +96,17 @@ Item {
 
 	MessageDialog {
 		id: deployWarningDialog
-		property bool redeploy
 		title: qsTr("Project")
 		text:
 		{
 			if (Object.keys(projectModel.deploymentAddresses).length > 0)
-			{
-				redeploy = true
-				standardButtons = StandardButton.Ok | StandardButton.Reset | StandardButton.Abort;
-				return qsTr("This project has been already deployed to the network. Do you want to repackage the resources only, or also reset the deployed contract to its initial state?")
-			}
+				return qsTr("This project has been already deployed to the network. Do you want to redeploy it? (Contract state will be reset)")
 			else
-			{
-				redeploy = false;
-				standardButtons = StandardButton.Ok | StandardButton.Abort;
 				return qsTr("This action will deploy to the network. Do you want to deploy it?")
-			}
 		}
 		icon: StandardIcon.Question
+		standardButtons: StandardButton.Ok | StandardButton.Abort
 		onAccepted: {
-			ProjectModelCode.startDeployProject(!redeploy);
-		}
-		onReset: {
 			ProjectModelCode.startDeployProject(true);
 		}
 	}
@@ -123,7 +115,6 @@ Item {
 		id: deployRessourcesDialog
 		title: qsTr("Project")
 		standardButtons: StandardButton.Ok
-		icon: StandardIcon.Info
 	}
 
 	DeploymentDialog

mix/qml/StatusPane.qml

@@ -1,6 +1,7 @@
 import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
+import QtQuick.Controls.Styles 1.3
 import "js/ErrorLocationFormater.js" as ErrorLocationFormater
 import "."
 
@@ -13,7 +14,7 @@ Rectangle {
 		if (!message)
 		{
 			status.state = "";
-			status.text = qsTr("Compile without errors.");
+			status.text = qsTr("Compile successfully.");
 			logslink.visible = false;
 			debugImg.state = "active";
 		}
@@ -35,17 +36,24 @@ Rectangle {
 		logslink.visible = false;
 	}
 
+	function errorMessage(text)
+	{
+		status.state = "error";
+		status.text = text
+		logslink.visible = false;
+	}
+
 	Connections {
 		target:clientModel
 		onRunStarted: infoMessage(qsTr("Running transactions..."));
-		onRunFailed: infoMessage(qsTr("Error running transactions"));
+		onRunFailed: errorMessage(qsTr("Error running transactions"));
 		onRunComplete: infoMessage(qsTr("Run complete"));
 		onNewBlock: infoMessage(qsTr("New block created"));
 	}
 	Connections {
 		target:projectModel
 		onDeploymentStarted: infoMessage(qsTr("Running deployment..."));
-		onDeploymentError: infoMessage(error);
+		onDeploymentError: errorMessage(error);
 		onDeploymentComplete: infoMessage(qsTr("Deployment complete"));
 		onDeploymentStepChanged: infoMessage(message);
 	}
@@ -57,6 +65,7 @@ Rectangle {
 
 	color: "transparent"
 	anchors.fill: parent
+
 	Rectangle {
 		id: statusContainer
 		anchors.horizontalCenter: parent.horizontalCenter
@@ -65,49 +74,84 @@ Rectangle {
 		width: 500
 		height: 30
 		color: "#fcfbfc"
-		RowLayout {
-			anchors.horizontalCenter: parent.horizontalCenter
-			anchors.verticalCenter: parent.verticalCenter
-			spacing: 5
 
-			Text {
-				font.pointSize: StatusPaneStyle.general.statusFontSize
-				height: 9
-				font.family: "sans serif"
-				objectName: "status"
-				id: status
-				states:[
-					State {
-						name: "error"
-						PropertyChanges {
-							target: status
-							color: "red"
-						}
-						PropertyChanges {
-							target: statusContainer
-							color: "#fffcd5"
-						}
+		Text {
+			anchors.verticalCenter: parent.verticalCenter
+			anchors.horizontalCenter: parent.horizontalCenter
+			font.pointSize: StatusPaneStyle.general.statusFontSize
+			height: 15
+			font.family: "sans serif"
+			objectName: "status"
+			wrapMode: Text.WrapAnywhere
+			elide: Text.ElideRight
+			maximumLineCount: 1
+			clip: true
+			id: status
+			states: [
+				State {
+					name: "error"
+					PropertyChanges {
+						target: status
+						color: "red"
 					}
-				]
+					PropertyChanges {
+						target: statusContainer
+						color: "#fffcd5"
+					}
+				}
+			]
+			onTextChanged:
+			{
+				updateWidth()
+				toolTipInfo.tooltip = text;
 			}
 
-			Text {
-				visible: false
-				font.pointSize: StatusPaneStyle.general.logLinkFontSize
-				height: 9
-				text: qsTr("See Log.")
-				font.family: "Monospace"
-				objectName: "status"
-				id: logslink
-				color: "#8c8a74"
-				MouseArea {
-					anchors.fill: parent
-					onClicked: {
-						mainContent.ensureRightView();
-					}
+			function updateWidth()
+			{
+				if (text.length > 80)
+					width = parent.width - 10
+				else
+					width = undefined
+			}
+		}
+
+		Button
+		{
+			anchors.fill: parent
+			id: toolTip
+			action: toolTipInfo
+			text: ""
+			style:
+				ButtonStyle {
+				background:Rectangle {
+					color: "transparent"
 				}
 			}
 		}
+
+		Action {
+			id: toolTipInfo
+			tooltip: ""
+		}
+	}
+
+	Button
+	{
+		id: logslink
+		anchors.left: statusContainer.right
+		anchors.leftMargin: 9
+		visible: false
+		anchors.verticalCenter: parent.verticalCenter
+		action: displayLogAction
+		iconSource: "qrc:/qml/img/search_filled.png"
+	}
+
+	Action {
+		id: displayLogAction
+		tooltip: qsTr("Display Log")
+		onTriggered: {
+			mainContent.displayCompilationErrorIfAny();
+		}
 	}
 
 	Rectangle
@@ -120,9 +164,13 @@ Rectangle {
 		RowLayout
 		{
 			anchors.fill: parent
-			Rectangle {
+			anchors.top: statusHeader.top
+			anchors.right: statusHeader.right
+			Rectangle
+			{
 				color: "transparent"
 				anchors.fill: parent
+
 				Button
 				{
 					anchors.right: parent.right

mix/qml/TransactionLog.qml

@@ -3,15 +3,13 @@ import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1
 import QtQuick.Dialogs 1.1
 import QtQuick.Layouts 1.1
+import org.ethereum.qml.RecordLogEntry 1.0
 
 Item {
 
-	property bool showLogs: true
 	property ListModel fullModel: ListModel{}
 	property ListModel transactionModel: ListModel{}
-	onShowLogsChanged: {
-		logTable.model = showLogs ? fullModel : transactionModel
-	}
+	property ListModel callModel: ListModel{}
 
 	Action {
 		id: addStateAction
@@ -78,13 +76,24 @@ Item {
 				action: mineAction
 			}
 
-			CheckBox {
-				id: recording
-				text: qsTr("Record transactions");
-				checked: true
-				Layout.fillWidth: true
+			ComboBox {
+				id: itemFilter
+
+				function getCurrentModel()
+				{
+					return currentIndex === 0 ? fullModel : currentIndex === 1 ? transactionModel : currentIndex === 2 ? callModel : fullModel;
+				}
 
+				model: ListModel {
+					ListElement { text: qsTr("Calls and Transactions"); value: 0;  }
+					ListElement { text: qsTr("Only Transactions"); value: 1;  }
+					ListElement { text: qsTr("Only Calls"); value: 2;  }
+				}
 
+				onCurrentIndexChanged:
+				{
+					logTable.model = itemFilter.getCurrentModel();
+				}
 			}
 		}
 		TableView {
@@ -125,7 +134,10 @@ Item {
 			}
 			onActivated:  {
 				var item = logTable.model.get(row);
-				clientModel.debugRecord(item.recordIndex);
+				if (item.type === RecordLogEntry.Transaction)
+					clientModel.debugRecord(item.recordIndex);
+				else
+					clientModel.emptyRecord();
 			}
 			Keys.onPressed: {
 				if ((event.modifiers & Qt.ControlModifier) && event.key === Qt.Key_C && currentRow >=0 && currentRow < logTable.model.count) {
@@ -141,15 +153,18 @@ Item {
 		onStateCleared: {
 			fullModel.clear();
 			transactionModel.clear();
+			callModel.clear();
 		}
 		onNewRecord: {
-			if (recording.checked)
-			{
-				fullModel.append(_r);
-				if (!_r.call)
-					transactionModel.append(_r);
-			}
+			fullModel.append(_r);
+			if (!_r.call)
+				transactionModel.append(_r);
+			else
+				callModel.append(_r);
+		}
+		onMiningComplete: {
+			fullModel.append(clientModel.lastBlock);
+			transactionModel.append(clientModel.lastBlock);
 		}
 	}
-
 }

mix/qml/WebCodeEditor.qml

@@ -2,15 +2,16 @@ import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.0
 import QtQuick.Controls.Styles 1.1
-import CodeEditorExtensionManager 1.0
 import QtWebEngine 1.0
 import QtWebEngine.experimental 1.0
 
 Item {
-	signal editorTextChanged
+	signal editorTextChanged;
+	signal breakpointsChanged;
 	property string currentText: ""
 	property string currentMode: ""
 	property bool initialized: false
+	property var currentBreakpoints: [];
 
 	function setText(text, mode) {
 		currentText = text;
@@ -37,6 +38,18 @@ Item {
 		}
 	}
 
+	function highlightExecution(location) {
+		editorBrowser.runJavaScript("highlightExecution(" + location.start + "," + location.end + ")");
+	}
+
+	function getBreakpoints() {
+		return currentBreakpoints;
+	}
+
+	function toggleBreakpoint() {
+		editorBrowser.runJavaScript("toggleBreakpoint()");
+	}
+
 	Connections {
 		target: appContext
 		onClipboardChanged:	syncClipboard()
@@ -80,6 +93,17 @@ Item {
 						});
 					}
 				});
+				editorBrowser.runJavaScript("getBreakpointsChanged()", function(result) {
+					if (result === true) {
+						editorBrowser.runJavaScript("getBreakpoints()" , function(bp) {
+							if (currentBreakpoints !== bp) {
+								currentBreakpoints = bp;
+								breakpointsChanged();
+							}
+						});
+					}
+				});
+
 			}
 		}
 	}

mix/qml/WebPreview.qml

@@ -26,7 +26,8 @@ Item {
 	function reload() {
 		if (initialized) {
 			updateContract();
-			webView.runJavaScript("reloadPage()");
+			//webView.runJavaScript("reloadPage()");
+			setPreviewUrl(urlInput.text);
 		}
 	}
 
@@ -55,11 +56,13 @@ Item {
 	}
 
 	function changePage() {
-		if (pageCombo.currentIndex >= 0 && pageCombo.currentIndex < pageListModel.count) {
+		setPreviewUrl(urlInput.text);
+		/*if (pageCombo.currentIndex >= 0 && pageCombo.currentIndex < pageListModel.count) {
+			urlInput.text = httpServer.url + "/" + pageListModel.get(pageCombo.currentIndex).documentId;
 			setPreviewUrl(httpServer.url + "/" + pageListModel.get(pageCombo.currentIndex).documentId);
 		} else {
 			setPreviewUrl("");
-		}
+		}*/
 	}
 	Connections {
 		target: appContext
@@ -98,24 +101,16 @@ Item {
 			updateDocument(documentId, function(i) { pageListModel.set(i, projectModel.getDocument(documentId)) } )
 		}
 
-		onDocumentOpened: {
-			if (!document.isHtml)
-				return;
-			for (var i = 0; i < pageListModel.count; i++) {
-				var doc = pageListModel.get(i);
-				if (doc.documentId === document.documentId) {
-					pageCombo.currentIndex = i;
-				}
-			}
-		}
-
 		onProjectLoading: {
 			for (var i = 0; i < target.listModel.count; i++) {
 				var document = target.listModel.get(i);
 				if (document.isHtml) {
 					pageListModel.append(document);
 					if (pageListModel.count === 1) //first page added
-						changePage();
+					{
+						urlInput.text = httpServer.url + "/" + document.documentId;
+						setPreviewUrl(httpServer.url + "/" + document.documentId);
+					}
 				}
 			}
 		}
@@ -151,13 +146,20 @@ Item {
 			else
 			{
 				//document request
+				if (urlPath === "/")
+					urlPath = "/index.html";
 				var documentId = urlPath.substr(urlPath.lastIndexOf("/") + 1);
 				var content = "";
 				if (projectModel.codeEditor.isDocumentOpen(documentId))
 					content = projectModel.codeEditor.getDocumentText(documentId);
 				else
-					content = fileIo.readFile(projectModel.getDocument(documentId).path);
-				if (documentId === pageListModel.get(pageCombo.currentIndex).documentId) {
+				{
+					var doc = projectModel.getDocument(documentId);
+					if (doc !== undefined)
+						content = fileIo.readFile(doc.path);
+				}
+
+				if (documentId === urlInput.text.replace(httpServer.url + "/", "")) {
 					//root page, inject deployment script
 					content = "<script>web3=parent.web3;contracts=parent.contracts;</script>\n" + content;
 					_request.setResponseContentType("text/html");
@@ -181,19 +183,23 @@ Item {
 				anchors.fill: parent
 				anchors.leftMargin: 3
 				spacing: 3
-				DefaultLabel {
-					text: qsTr("Preview of")
-					anchors.verticalCenter: parent.verticalCenter
-				}
 
-				ComboBox {
-					id: pageCombo
-					model: pageListModel
-					textRole: "name"
-					currentIndex: -1
-					onCurrentIndexChanged: changePage()
+				DefaultTextField
+				{
+					id: urlInput
 					anchors.verticalCenter: parent.verticalCenter
 					height: 21
+					width: 300
+					Keys.onEnterPressed:
+					{
+						setPreviewUrl(text);
+					}
+					Keys.onReturnPressed:
+					{
+						setPreviewUrl(text);
+					}
+
+					focus: true
 				}
 
 				Action {

mix/qml/html/cm/codemirror.css

@@ -8,6 +8,10 @@
   font-size:12px
 }
 
+/* BREAKPOINTS */
+.breakpoints {width: .8em;}
+.breakpoint { color: #822; }
+
 /* PADDING */
 
 .CodeMirror-lines {

mix/qml/html/cm/solarized.css

@@ -163,3 +163,9 @@ view-port
 .cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
   background: rgba(0, 0, 0, 0.10);
 }
+
+/* Code execution */
+.CodeMirror-exechighlight {
+	background: rgba(255, 255, 255, 0.10);
+}
+

mix/qml/html/codeeditor.js

@@ -4,6 +4,7 @@ var editor = CodeMirror(document.body, {
 							//styleActiveLine: true,
 							matchBrackets: true,
 							autofocus: true,
+							gutters: ["CodeMirror-linenumbers", "breakpoints"]
 						});
 
 
@@ -13,6 +14,7 @@ editor.setOption("indentWithTabs", true);
 editor.setOption("fullScreen", true);
 
 editor.changeRegistered = false;
+editor.breakpointsChangeRegistered = false;
 
 editor.on("change", function(eMirror, object) {
 	editor.changeRegistered = true;
@@ -33,6 +35,28 @@ editor.setOption("extraKeys", {
 	}});
 }
 
+makeMarker = function() {
+  var marker = document.createElement("div");
+  marker.style.color = "#822";
+  marker.innerHTML = "●";
+  return marker;
+};
+
+toggleBreakpointLine = function(n) {
+	var info = editor.lineInfo(n);
+	editor.setGutterMarker(n, "breakpoints", info.gutterMarkers ? null : makeMarker());
+	editor.breakpointsChangeRegistered = true;
+}
+
+editor.on("gutterClick", function(cm, n) {
+	toggleBreakpointLine(n);
+});
+
+toggleBreakpoint = function() {
+	var line = editor.getCursor().line;
+	toggleBreakpointLine(line);
+}
+
 getTextChanged = function() {
 	return editor.changeRegistered;
 };
@@ -42,6 +66,25 @@ getText = function() {
 	return editor.getValue();
 };
 
+getBreakpointsChanged = function() {
+	return editor.changeRegistered || editor.breakpointsChangeRegistered;   //TODO: track new lines
+};
+
+getBreakpoints = function() {
+	var locations = [];
+	editor.breakpointsChangeRegistered = false;
+	var doc = editor.doc;
+	doc.iter(function(line) {
+		if (line.gutterMarkers && line.gutterMarkers["breakpoints"]) {
+			var l = doc.getLineNumber(line);
+			locations.push({
+				start: editor.indexFromPos({ line: l, ch: 0}),
+				end: editor.indexFromPos({ line: l + 1, ch: 0})
+			});;
+		}
+	});
+	return locations;
+};
 
 setTextBase64 = function(text) {
 	editor.setValue(window.atob(text));
@@ -60,3 +103,10 @@ setMode = function(mode) {
 setClipboardBase64 = function(text) {
 	clipboard = window.atob(text);
 };
+
+var executionMark;
+highlightExecution = function(start, end) {
+	if (executionMark)
+		executionMark.clear();
+	executionMark = editor.markText(editor.posFromIndex(start), editor.posFromIndex(end), { className: "CodeMirror-exechighlight" });
+}

mix/qml/js/Debugger.js

@@ -5,6 +5,9 @@ var currentSelectedState = null;
 var currentDisplayedState = null;
 var debugData = null;
 var codeMap = null;
+var locations = [];
+var locationMap = {};
+var breakpoints = {};
 
 function init(data)
 {
@@ -22,6 +25,8 @@ function init(data)
 		currentSelectedState = null;
 		currentDisplayedState = null;
 		debugData = null;
+		locations = [];
+		locationMap = {};
 		return;
 	}
 
@@ -30,9 +35,59 @@ function init(data)
 	currentDisplayedState = 0;
 	setupInstructions(currentSelectedState);
 	setupCallData(currentSelectedState);
-	statesSlider.maximumValue = data.states.length - 1;
+	initLocations();
+	initSlider();
+	selectState(currentSelectedState);
+}
+
+function updateMode()
+{
+	initSlider();
+}
+
+function initLocations()
+{
+	locations = [];
+	if (debugData.states.length === 0)
+		return;
+
+	var nullLocation = { start: -1, end: -1, documentId: "", state: 0 };
+	var prevLocation = nullLocation;
+
+	for (var i = 0; i < debugData.states.length - 1; i++) {
+		var code = debugData.states[i].code;
+		var location = code.documentId ? code.locations[codeStr(i)] : nullLocation;
+		if (location.start !== prevLocation.start || location.end !== prevLocation.end || code.documentId !== prevLocation.documentId)
+		{
+			prevLocation = { start: location.start, end: location.end, documentId: code.documentId, state: i };
+			locations.push(prevLocation);
+		}
+		locationMap[i] = locations.length - 1;
+	}
+	locations.push({ start: -1, end: -1, documentId: code.documentId, state: i });
+	locationMap[debugData.states.length - 1] = locations.length - 1;
+}
+
+function setBreakpoints(bp)
+{
+	breakpoints = bp;
+}
+
+function srcMode()
+{
+	return !assemblyMode && locations.length;
+}
+
+function initSlider()
+{
+	if (!debugData)
+		statesSlider.maximumValue = 0;
+	else if (srcMode()) {
+		statesSlider.maximumValue = locations.length - 1;
+	} else {
+		statesSlider.maximumValue = debugData.states.length - 1;
+	}
 	statesSlider.value = 0;
-	select(currentSelectedState);
 }
 
 function setupInstructions(stateIndex)
@@ -54,11 +109,13 @@ function setupCallData(stateIndex)
 
 function moveSelection(incr)
 {
-	var prevState = currentSelectedState;
-	if (currentSelectedState + incr >= 0)
-	{
-		if (currentSelectedState + incr < debugData.states.length)
-			select(currentSelectedState + incr);
+	if (srcMode()) {
+		var locationIndex = locationMap[currentSelectedState];
+		if (locationIndex + incr >= 0 && locationIndex + incr < locations.length)
+			selectState(locations[locationIndex + incr].state);
+	} else {
+		if (currentSelectedState + incr >= 0 && currentSelectedState + incr < debugData.states.length)
+			selectState(currentSelectedState + incr);
 	}
 }
 
@@ -67,7 +124,7 @@ function display(stateIndex)
 	if (stateIndex < 0)
 		stateIndex = 0;
 	if (stateIndex >= debugData.states.length)
-		stateIndex = debugData.state.length - 1;
+		stateIndex = debugData.states.length - 1;
 	if (debugData.states[stateIndex].codeIndex !== debugData.states[currentDisplayedState].codeIndex)
 		setupInstructions(stateIndex);
 	if (debugData.states[stateIndex].dataIndex !== debugData.states[currentDisplayedState].dataIndex)
@@ -77,6 +134,9 @@ function display(stateIndex)
 	highlightSelection(codeLine);
 	completeCtxInformation(state);
 	currentDisplayedState = stateIndex;
+	var docId = debugData.states[stateIndex].code.documentId;
+	if (docId)
+		debugExecuteLocation(docId, locations[locationMap[stateIndex]]);
 }
 
 function displayFrame(frameIndex)
@@ -88,26 +148,39 @@ function displayFrame(frameIndex)
 		display(state.levels[frameIndex - 1]);
 }
 
-function select(stateIndex)
+function select(index)
+{
+	if (srcMode())
+		selectState(locations[index].state);
+	else
+		selectState(index);
+}
+
+function selectState(stateIndex)
 {
 	display(stateIndex);
 	currentSelectedState = stateIndex;
 	var state = debugData.states[stateIndex];
-	statesSlider.value = stateIndex;
 	jumpIntoForwardAction.enabled(stateIndex < debugData.states.length - 1)
 	jumpIntoBackAction.enabled(stateIndex > 0);
 	jumpOverForwardAction.enabled(stateIndex < debugData.states.length - 1);
 	jumpOverBackAction.enabled(stateIndex > 0);
 	jumpOutBackAction.enabled(state.levels.length > 1);
 	jumpOutForwardAction.enabled(state.levels.length > 1);
+	runForwardAction.enabled(stateIndex < debugData.states.length - 1)
+	runBackAction.enabled(stateIndex > 0);
 
 	var callStackData = [];
 	for (var l = 0; l < state.levels.length; l++) {
-		var address = debugData.states[state.levels[l] + 1].address;
+		var address = debugData.states[state.levels[l] + 1].code.address;
 		callStackData.push(address);
 	}
-	callStackData.push(debugData.states[0].address);
+	callStackData.push(debugData.states[0].code.address);
 	callStack.listModel = callStackData;
+	if (srcMode())
+		statesSlider.value = locationMap[stateIndex];
+	else
+		statesSlider.value = stateIndex;
 }
 
 function codeStr(stateIndex)
@@ -147,6 +220,24 @@ function isReturnInstruction(index)
 	return state.instruction === "RETURN"
 }
 
+function locationsIntersect(l1, l2)
+{
+	return l1.start <= l2.end && l1.end >= l2.start;
+}
+
+function breakpointHit(i)
+{
+	var bpLocations = breakpoints[debugData.states[i].code.documentId];
+	if (bpLocations) {
+		var location = locations[locationMap[i]];
+		if (location.start >= 0 && location.end >= location.start)
+			for (var b = 0; b < bpLocations.length; b++)
+				if (locationsIntersect(location, bpLocations[b]))
+					return true;
+	}
+	return false;
+}
+
 function stepIntoBack()
 {
 	moveSelection(-1);
@@ -173,25 +264,48 @@ function stepIntoForward()
 	moveSelection(1);
 }
 
+function runBack()
+{
+	var i = currentSelectedState - 1;
+	while (i > 0 && !breakpointHit(i)) {
+		--i;
+	}
+	selectState(i);
+}
+
+function runForward()
+{
+	var i = currentSelectedState + 1;
+	while (i < debugData.states.length - 1 && !breakpointHit(i)) {
+		++i;
+	}
+	selectState(i);
+}
+
 function stepOutBack()
 {
 	var i = currentSelectedState - 1;
 	var depth = 0;
-	while (--i >= 0)
+	while (--i >= 0) {
+		if (breakpointHit(i))
+			break;
 		if (isCallInstruction(i))
 			if (depth == 0)
 				break;
 			else depth--;
 		else if (isReturnInstruction(i))
 			depth++;
-	select(i);
+	}
+	selectState(i);
 }
 
 function stepOutForward()
 {
 	var i = currentSelectedState;
 	var depth = 0;
-	while (++i < debugData.states.length)
+	while (++i < debugData.states.length) {
+		if (breakpointHit(i))
+			break;
 		if (isReturnInstruction(i))
 			if (depth == 0)
 				break;
@@ -199,7 +313,8 @@ function stepOutForward()
 				depth--;
 		else if (isCallInstruction(i))
 			depth++;
-	select(i + 1);
+	}
+	selectState(i + 1);
 }
 
 function jumpTo(value)

mix/qml/js/ProjectModel.js

@@ -20,6 +20,7 @@
  * Ethereum IDE client.
  */
 Qt.include("QEtherHelper.js")
+Qt.include("TransactionHelper.js")
 
 var htmlTemplate = "<html>\n<head>\n<script>\n</script>\n</head>\n<body>\n<script>\n</script>\n</body>\n</html>";
 var contractTemplate = "contract Contract {\n}\n";
@@ -50,7 +51,8 @@ function saveProject() {
 			applicationUrlEth: deploymentDialog.applicationUrlEth,
 			applicationUrlHttp: deploymentDialog.applicationUrlHttp,
 			packageHash: deploymentDialog.packageHash,
-			packageBase64: deploymentDialog.packageBase64
+			packageBase64: deploymentDialog.packageBase64,
+			deploymentDir: projectModel.deploymentDir
 		};
 		for (var i = 0; i < projectListModel.count; i++)
 			projectData.files.push(projectListModel.get(i).fileName)
@@ -64,10 +66,12 @@ function saveProject() {
 
 function loadProject(path) {
 	closeProject();
-	console.log("loading project at " + path);
+	console.log("Loading project at " + path);
 	var projectFile = path + projectFileName;
 	var json = fileIo.readFile(projectFile);
 	var projectData = JSON.parse(json);
+	if (projectData.deploymentDir)
+		projectModel.deploymentDir = projectData.deploymentDir
 	if (projectData.packageHash)
 		deploymentDialog.packageHash =  projectData.packageHash
 	if (projectData.packageBase64)
@@ -185,7 +189,7 @@ function doCloseProject() {
 
 function doCreateProject(title, path) {
 	closeProject();
-	console.log("creating project " + title + " at " + path);
+	console.log("Creating project " + title + " at " + path);
 	if (path[path.length - 1] !== "/")
 		path += "/";
 	var dirPath = path + title + "/";
@@ -303,49 +307,61 @@ function startDeployProject(erasePrevious)
 	console.log("Deploying " + deploymentId + " to " + jsonRpcUrl);
 	deploymentStarted();
 
-	var requests = [];
-	var requestNames = [];
-
-	for (var c in codeModel.contracts) { //TODO: order based on dependencies
-		var code = codeModel.contracts[c].codeHex;
-		requests.push({
-			jsonrpc: "2.0",
-			method: "eth_transact",
-			params: [ { "code": code } ],
-			id: jsonRpcRequestId++
+	var ctrNames = Object.keys(codeModel.contracts);
+	var ctrAddresses = {};
+	setDefaultBlock(0, function() {
+		deployContracts(0, ctrAddresses, ctrNames, function (){
+			finalizeDeployment(deploymentId, ctrAddresses);
 		});
-		requestNames.push(c);
-	}
+	});
+}
 
-	var rpcRequest = JSON.stringify(requests);
-	var httpRequest = new XMLHttpRequest();
-	httpRequest.open("POST", jsonRpcUrl, true);
-	httpRequest.setRequestHeader("Content-type", "application/json");
-	httpRequest.setRequestHeader("Content-length", rpcRequest.length);
-	httpRequest.setRequestHeader("Connection", "close");
-	httpRequest.onreadystatechange = function() {
-		if (httpRequest.readyState === XMLHttpRequest.DONE) {
-			if (httpRequest.status === 200) {
-				var rpcResponse = JSON.parse(httpRequest.responseText);
-				if (rpcResponse.length === requestNames.length) {
-					var contractAddresses = {};
-					for (var r = 0; r < rpcResponse.length; r++)
-						contractAddresses[requestNames[r]] = rpcResponse[r].result;
-					finalizeDeployment(deploymentId, contractAddresses);
-				}
-			} else {
-				var errorText = qsTr("Deployment error: RPC server HTTP status ") + httpRequest.status;
-				console.log(errorText);
-				deploymentError(errorText);
+function setDefaultBlock(val, callBack)
+{
+	var requests = [{
+						jsonrpc: "2.0",
+						method: "eth_setDefaultBlock",
+						params: [val],
+						id: 0
+					}];
+	rpcCall(requests, function (httpCall, response){
+		callBack();
+	});
+}
+
+function deployContracts(ctrIndex, ctrAddresses, ctrNames, callBack)
+{
+	var code = codeModel.contracts[ctrNames[ctrIndex]].codeHex;
+	var requests = [{
+						jsonrpc: "2.0",
+						method: "eth_transact",
+						params: [ { "from": deploymentDialog.currentAccount, "gas": deploymentDialog.gasToUse, "code": code } ],
+						id: 0
+					}];
+	rpcCall(requests, function (httpCall, response){
+		var txt = qsTr("Please wait while " + ctrNames[ctrIndex] + " is published ...")
+		deploymentStepChanged(txt);
+		console.log(txt);
+		ctrAddresses[ctrNames[ctrIndex]] = JSON.parse(response)[0].result
+		deploymentDialog.waitForTrCountToIncrement(function(status) {
+			if (status === -1)
+			{
+				trCountIncrementTimeOut();
+				return;
 			}
-		}
-	}
-	httpRequest.send(rpcRequest);
+			ctrIndex++;
+			if (ctrIndex < ctrNames.length)
+				deployContracts(ctrIndex, ctrAddresses, ctrNames, callBack);
+			else
+				callBack();
+		});
+	});
 }
 
 function finalizeDeployment(deploymentId, addresses) {
 	deploymentStepChanged(qsTr("Packaging application ..."));
 	var deploymentDir = projectPath + deploymentId + "/";
+	projectModel.deploymentDir = deploymentDir;
 	fileIo.makeDir(deploymentDir);
 	for (var i = 0; i < projectListModel.count; i++) {
 		var doc = projectListModel.get(i);
@@ -372,16 +388,16 @@ function finalizeDeployment(deploymentId, addresses) {
 	}
 	//write deployment js
 	var deploymentJs =
-		"// Autogenerated by Mix\n" +
-		"web3 = require(\"web3\");\n" +
-		"contracts = {};\n";
+			"// Autogenerated by Mix\n" +
+			"web3 = require(\"web3\");\n" +
+			"contracts = {};\n";
 	for (var c in codeModel.contracts)  {
 		var contractAccessor = "contracts[\"" + codeModel.contracts[c].contract.name + "\"]";
 		deploymentJs += contractAccessor + " = {\n" +
-		"\tinterface: " + codeModel.contracts[c].contractInterface + ",\n" +
-		"\taddress: \"" + addresses[c] + "\"\n" +
-		"};\n" +
-		contractAccessor + ".contract = web3.eth.contract(" + contractAccessor + ".address, " + contractAccessor + ".interface);\n";
+				"\tinterface: " + codeModel.contracts[c].contractInterface + ",\n" +
+				"\taddress: \"" + addresses[c] + "\"\n" +
+				"};\n" +
+				contractAccessor + ".contract = web3.eth.contract(" + contractAccessor + ".address, " + contractAccessor + ".interface);\n";
 	}
 	fileIo.writeFile(deploymentDir + "deployment.js", deploymentJs);
 	//copy scripts
@@ -395,152 +411,185 @@ function finalizeDeployment(deploymentId, addresses) {
 	deploymentDialog.packageBase64 = packageRet[1];
 
 	var applicationUrlEth = deploymentDialog.applicationUrlEth;
-	applicationUrlEth = formatAppUrl(applicationUrlEth);
 
+	applicationUrlEth = formatAppUrl(applicationUrlEth);
 	deploymentStepChanged(qsTr("Registering application on the Ethereum network ..."));
-	checkRegistration(applicationUrlEth, deploymentDialog.eth, function () {
+	checkEthPath(applicationUrlEth, function () {
 		deploymentComplete();
 		deployRessourcesDialog.text = qsTr("Register Web Application to finalize deployment.");
 		deployRessourcesDialog.open();
+		setDefaultBlock(-1, function() {});
 	});
 }
 
-function rpcCall(requests, callBack)
+function checkEthPath(dappUrl, callBack)
 {
-	var jsonRpcUrl = "http://localhost:8080";
-	var rpcRequest = JSON.stringify(requests);
-	var httpRequest = new XMLHttpRequest();
-	httpRequest.open("POST", jsonRpcUrl, true);
-	httpRequest.setRequestHeader("Content-type", "application/json");
-	httpRequest.setRequestHeader("Content-length", rpcRequest.length);
-	httpRequest.setRequestHeader("Connection", "close");
-	httpRequest.onreadystatechange = function() {
-		if (httpRequest.readyState === XMLHttpRequest.DONE) {
-			if (httpRequest.status !== 200)
-			{
-				var errorText = qsTr("Deployment error: Error while registering Dapp ") + httpRequest.status;
-				console.log(errorText);
-				deploymentError(errorText);
-				return;
-			}
-			callBack(httpRequest.status, httpRequest.responseText)
-		}
-	}
-	httpRequest.send(rpcRequest);
-}
-
-
-function checkRegistration(dappUrl, addr, callBack)
-{
-	var requests = [];
-	var data  = "";
-	if (dappUrl.length > 0)
+	if (dappUrl.length === 1)
+		registerContentHash(deploymentDialog.eth, callBack); // we directly create a dapp under the root registrar.
+	else
 	{
-		//checking path (register).
+		// the first owned reigstrar must have been created to follow the path.
 		var str = createString(dappUrl[0]);
-		data  = "0x6be16bed" + str.encodeValueAsString();
-		console.log("checking if path exists (register) => " + JSON.stringify(dappUrl));
+		var requests = [];
 		requests.push({
-			jsonrpc: "2.0",
-			method: "eth_call",
-			params: [ { "to": '0x' + addr, "data": data } ],
-			id: jsonRpcRequestId++
-		});
-
+						  //register()
+						  jsonrpc: "2.0",
+						  method: "eth_call",
+						  params: [ { "from": deploymentDialog.currentAccount,  "to": '0x' + deploymentDialog.eth, "data": "0x6be16bed"  + str.encodeValueAsString() } ],
+						  id: jsonRpcRequestId++
+					  });
 		rpcCall(requests, function (httpRequest, response) {
-			var address = JSON.parse(response)[0].result.replace('0x', '');
-			if (address === "")
+			var res = JSON.parse(response);
+			var addr = normalizeAddress(res[0].result);
+			if (addr.replace(/0+/g, "") === "")
 			{
-				var errorTxt = qsTr("Path does not exists " + JSON.stringify(dappUrl) + " cannot continue");
+				var errorTxt = qsTr("Path does not exists " + JSON.stringify(dappUrl) + ". Please register using Registration Dapp. Aborting.");
 				deploymentError(errorTxt);
 				console.log(errorTxt);
-				return;
 			}
-
-			dappUrl.splice(0, 1);
-			checkRegistration(dappUrl, address, callBack);
+			else
+			{
+				dappUrl.splice(0, 1);
+				checkRegistration(dappUrl, addr, callBack);
+			}
 		});
 	}
+}
+
+function checkRegistration(dappUrl, addr, callBack)
+{
+	if (dappUrl.length === 1)
+		registerContentHash(addr, callBack); // We do not create the register for the last part, just registering the content hash.
 	else
 	{
-		var paramTitle = createString(projectModel.projectTitle);
+		var txt = qsTr("Checking " + JSON.stringify(dappUrl) + " ... in registrar " + addr);
+		deploymentStepChanged(txt);
+		console.log(txt);
+		var requests = [];
+		var registrar = {}
+		var str = createString(dappUrl[0]);
 		requests.push({
-						  //owner()
+						  //getOwner()
 						  jsonrpc: "2.0",
 						  method: "eth_call",
-						  params: [ { "to": '0x' + addr, "data": "0xec7b9200" + paramTitle.encodeValueAsString() } ],
+						  params: [ { "from": deploymentDialog.currentAccount, "to": '0x' + addr, "data": "0x893d20e8" } ],
 						  id: jsonRpcRequestId++
 					  });
 
 		requests.push({
-						  //accounts
+						  //register()
 						  jsonrpc: "2.0",
-						  method: "eth_accounts",
-						  params: null,
+						  method: "eth_call",
+						  params: [ { "from": deploymentDialog.currentAccount, "to": '0x' + addr, "data": "0x6be16bed"  + str.encodeValueAsString() } ],
 						  id: jsonRpcRequestId++
 					  });
 
 		rpcCall(requests, function (httpRequest, response) {
-			requests = [];
 			var res = JSON.parse(response);
-			var currentOwner = res[0].result;
-			var noOwner = currentOwner.replace('0x', '').replace(/0/g, '') === '';
-
-			if (noOwner)
+			var nextAddr = normalizeAddress(res[1].result);
+			var errorTxt;
+			if (res[1].result === "0x")
 			{
-				requests.push({
-							  //reserve()
-							  jsonrpc: "2.0",
-							  method: "eth_transact",
-							  params: [ { "to": '0x' + addr, "data": "0x1c83171b" + paramTitle.encodeValueAsString() } ],
-							  id: jsonRpcRequestId++
-						  });
+				errorTxt = qsTr("Error when creating new owned regsitrar. Please use the regsitration Dapp. Aborting");
+				deploymentError(errorTxt);
+				console.log(errorTxt);
+			}
+			else if (normalizeAddress(deploymentDialog.currentAccount) !== normalizeAddress(res[0].result))
+			{
+				errorTxt = qsTr("You are not the owner of " + dappUrl[0] + ". Aborting");
+				deploymentError(errorTxt);
+				console.log(errorTxt);
+			}
+			else if (nextAddr.replace(/0+/g, "") !== "")
+			{
+				dappUrl.splice(0, 1);
+				checkRegistration(dappUrl, nextAddr, callBack);
 			}
 			else
 			{
-				var bOwner = false;
-				currentOwner = normalizeAddress(currentOwner);
-				for (var u in res[1].result)
-				{
-					if (normalizeAddress(res[1].result[u]) === currentOwner)
-						bOwner = true;
-				}
-
-				if (!bOwner)
-				{
-					var errorTxt = qsTr("Current user is not the owner of this path. Cannot continue")
-					deploymentError(errorTxt);
-					console.log(errorTxt);
-					return;
-				}
+				var txt = qsTr("Registering sub domain " + dappUrl[0] +  " ...");
+				console.log(txt);
+				deploymentStepChanged(txt);
+				//current registrar is owned => ownedregistrar creation and continue.
+				requests = [];
+
+				requests.push({
+								  jsonrpc: "2.0",
+								  method: "eth_transact",
+								  params: [ { "from": deploymentDialog.currentAccount, "gas": 20000, "code": "0x60056013565b61059e8061001d6000396000f35b33600081905550560060003560e060020a90048063019848921461009a578063449c2090146100af5780635d574e32146100cd5780635fd4b08a146100e1578063618242da146100f65780636be16bed1461010b5780636c4489b414610129578063893d20e8146101585780639607730714610173578063c284bc2a14610187578063e50f599a14610198578063e5811b35146101af578063ec7b9200146101cd57005b6100a560043561031b565b8060005260206000f35b6100ba6004356103a0565b80600160a060020a031660005260206000f35b6100db600435602435610537565b60006000f35b6100ec600435610529565b8060005260206000f35b6101016004356103dd565b8060005260206000f35b6101166004356103bd565b80600160a060020a031660005260206000f35b61013460043561034b565b82600160a060020a031660005281600160a060020a03166020528060405260606000f35b610160610341565b80600160a060020a031660005260206000f35b6101816004356024356102b4565b60006000f35b6101926004356103fd565b60006000f35b6101a96004356024356044356101f2565b60006000f35b6101ba6004356101eb565b80600160a060020a031660005260206000f35b6101d8600435610530565b80600160a060020a031660005260206000f35b6000919050565b600054600160a060020a031633600160a060020a031614610212576102af565b8160026000858152602001908152602001600020819055508061023457610287565b81600160a060020a0316837f680ad70765443c2967675ab0fb91a46350c01c6df59bf9a41ff8a8dd097464ec60006000a3826001600084600160a060020a03168152602001908152602001600020819055505b827f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b505050565b600054600160a060020a031633600160a060020a0316146102d457610317565b806002600084815260200190815260200160002060010181905550817f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b5050565b60006001600083600160a060020a03168152602001908152602001600020549050919050565b6000600054905090565b6000600060006002600085815260200190815260200160002054925060026000858152602001908152602001600020600101549150600260008581526020019081526020016000206002015490509193909250565b600060026000838152602001908152602001600020549050919050565b600060026000838152602001908152602001600020600101549050919050565b600060026000838152602001908152602001600020600201549050919050565b600054600160a060020a031633600160a060020a03161461041d57610526565b80600160006002600085815260200190815260200160002054600160a060020a031681526020019081526020016000205414610458576104d2565b6002600082815260200190815260200160002054600160a060020a0316817f680ad70765443c2967675ab0fb91a46350c01c6df59bf9a41ff8a8dd097464ec60006000a36000600160006002600085815260200190815260200160002054600160a060020a03168152602001908152602001600020819055505b6002600082815260200190815260200160002060008101600090556001810160009055600281016000905550807f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b50565b6000919050565b6000919050565b600054600160a060020a031633600160a060020a0316146105575761059a565b806002600084815260200190815260200160002060020181905550817f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b505056" } ],
+								  id: jsonRpcRequestId++
+							  });
+
+				rpcCall(requests, function(httpRequest, response) {
+					var newCtrAddress = normalizeAddress(JSON.parse(response)[0].result);
+					requests = [];
+					var txt = qsTr("Please wait " + dappUrl[0] + " is registering ...");
+					deploymentStepChanged(txt);
+					console.log(txt);
+					deploymentDialog.waitForTrCountToIncrement(function(status) {
+						if (status === -1)
+						{
+							trCountIncrementTimeOut();
+							return;
+						}
+						var crLevel = createString(dappUrl[0]).encodeValueAsString();
+						requests.push({
+										  //setRegister()
+										  jsonrpc: "2.0",
+										  method: "eth_transact",
+										  params: [ { "from": deploymentDialog.currentAccount, "gas": 2000, "to": '0x' + addr, "data": "0x96077307" + crLevel + deploymentDialog.pad(newCtrAddress) } ],
+										  id: jsonRpcRequestId++
+									  });
+
+						rpcCall(requests, function(request, response){
+							dappUrl.splice(0, 1);
+							checkRegistration(dappUrl, newCtrAddress, callBack);
+						});
+					});
+				});
 			}
-			console.log("setContentHash");
-			requests.push({
-						  //setContent()
-						  jsonrpc: "2.0",
-						  method: "eth_transact",
-						  params: [ { "to": '0x' + addr, "data": "0x5d574e32" + paramTitle.encodeValueAsString() + deploymentDialog.packageHash } ],
-						  id: jsonRpcRequestId++
-					  });
-			rpcCall(requests, function (httpRequest, response) {
-				callBack();
-			});
 		});
 	}
 }
 
+function trCountIncrementTimeOut()
+{
+	var error = qsTr("Something went wrong during the deployment. Please verify the amount of gas for this transaction and check your balance.")
+	console.log(error);
+	deploymentError(error);
+}
+
+function registerContentHash(registrar, callBack)
+{
+	var txt = qsTr("Finalizing Dapp registration ...");
+	deploymentStepChanged(txt);
+	console.log(txt);
+	var requests = [];
+	var paramTitle = createString(projectModel.projectTitle);
+	requests.push({
+					  //setContent()
+					  jsonrpc: "2.0",
+					  method: "eth_transact",
+					  params: [ { "from": deploymentDialog.currentAccount, "gas": 2000, "gasPrice": "10", "to": '0x' + registrar, "data": "0x5d574e32" + paramTitle.encodeValueAsString() + deploymentDialog.packageHash } ],
+					  id: jsonRpcRequestId++
+				  });
+	rpcCall(requests, function (httpRequest, response) {
+		callBack();
+	});
+}
+
 function registerToUrlHint()
 {
 	deploymentStepChanged(qsTr("Registering application Resources (" + deploymentDialog.applicationUrlHttp) + ") ...");
 	var requests = [];
 	var paramUrlHttp = createString(deploymentDialog.applicationUrlHttp);
 	requests.push({
-				  //urlHint => suggestUrl
-				  jsonrpc: "2.0",
-				  method: "eth_transact",
-				  params: [ { "to": '0x' + deploymentDialog.urlHintContract, "data": "0x4983e19c" + deploymentDialog.packageHash + paramUrlHttp.encodeValueAsString() } ],
-				  id: jsonRpcRequestId++
-			  });
+					  //urlHint => suggestUrl
+					  jsonrpc: "2.0",
+					  method: "eth_transact",
+					  params: [ { "to": '0x' + deploymentDialog.urlHintContract, "gas": 2000, "data": "0x4983e19c" + deploymentDialog.packageHash + paramUrlHttp.encodeValueAsString() } ],
+					  id: jsonRpcRequestId++
+				  });
 
 	rpcCall(requests, function (httpRequest, response) {
 		deploymentComplete();
@@ -550,40 +599,35 @@ function registerToUrlHint()
 function normalizeAddress(addr)
 {
 	addr = addr.replace('0x', '');
-	var i = 0;
-	for (var k in addr)
-	{
-		if (addr[k] !== "0")
-			break;
-		else
-			i++;
-	}
-	return addr.substring(i);
+	if (addr.length <= 40)
+		return addr;
+	var left = addr.length - 40;
+	return addr.substring(left);
 }
 
 function formatAppUrl(url)
 {
-	var slash = url.indexOf("/");
-	var dot = url.indexOf(".");
-	if (slash === -1 && dot === -1)
-		return url;
-	if ((slash !== -1 && slash < dot) || dot === -1)
-		return url.split("/");
+	if (url.toLowerCase().indexOf("eth://") === 0)
+		url = url.substring(6);
+	if (url === "")
+		return [projectModel.projectTitle];
+
+	var ret;
+	if (url.indexOf("/") === -1)
+		ret = url.split('.').reverse();
 	else
 	{
-		var dotted;
-		var ret = [];
-		if (slash !== -1)
-		{
-			ret.push(url.split("/"));
-			dotted = ret[0].split(".");
-		}
-		else
-			dotted = url.split(".");
-
-		for (var k in dotted)
-			ret.unshift(dotted[k]);
-		return ret;
+		var slash = url.indexOf("/");
+		var left = url.substring(0, slash);
+		var leftA = left.split(".");
+		leftA.reverse();
+
+		var right = url.substring(slash + 1);
+		var rightA = right.split('/');
+		ret = leftA.concat(rightA);
 	}
+	if (ret[0].toLowerCase() === "eth")
+		ret.splice(0, 1);
+	ret.push(projectModel.projectTitle);
+	return ret;
 }
-

mix/qml/js/TransactionHelper.js

@@ -10,3 +10,28 @@ function defaultTransaction()
 		parameters: {}
 	};
 }
+
+function rpcCall(requests, callBack)
+{
+	var jsonRpcUrl = "http://localhost:8080";
+	var rpcRequest = JSON.stringify(requests);
+	var httpRequest = new XMLHttpRequest();
+	httpRequest.open("POST", jsonRpcUrl, true);
+	httpRequest.setRequestHeader("Content-type", "application/json");
+	httpRequest.setRequestHeader("Content-length", rpcRequest.length);
+	httpRequest.setRequestHeader("Connection", "close");
+	httpRequest.onreadystatechange = function() {
+		if (httpRequest.readyState === XMLHttpRequest.DONE) {
+			if (httpRequest.status !== 200 || httpRequest.responseText === "")
+			{
+				var errorText = qsTr("Deployment error: Error while registering Dapp ") + httpRequest.status;
+				console.log(errorText);
+				deploymentError(errorText);
+			}
+			else
+				callBack(httpRequest.status, httpRequest.responseText)
+		}
+	}
+	httpRequest.send(rpcRequest);
+}
+

mix/qml/main.qml

@@ -37,7 +37,6 @@ ApplicationWindow {
 		}
 		Menu {
 			title: qsTr("Deploy")
-			MenuItem { action: debugRunAction }
 			MenuItem { action: mineAction }
 			MenuSeparator {}
 			MenuItem { action: editStatesAction }
@@ -46,6 +45,12 @@ ApplicationWindow {
 			MenuSeparator {}
 			MenuItem { action: toggleRunOnLoadAction }
 		}
+		Menu {
+			title: qsTr("Debug")
+			MenuItem { action: debugRunAction }
+			MenuSeparator {}
+			MenuItem { action: toggleAssemblyDebuggingAction }
+		}
 		Menu {
 			title: qsTr("Windows")
 			MenuItem { action: openNextDocumentAction }
@@ -56,7 +61,7 @@ ApplicationWindow {
 			MenuItem { action: toggleTransactionLogAction }
 			MenuItem { action: toggleWebPreviewAction }
 			MenuItem { action: toggleWebPreviewOrientationAction }
-			MenuItem { action: toggleCallsInLog }
+			//MenuItem { action: toggleCallsInLog }
 		}
 	}
 
@@ -92,7 +97,7 @@ ApplicationWindow {
 
 	Action {
 		id: mineAction
-		text: qsTr("Mine")
+		text: qsTr("New Block")
 		shortcut: "Ctrl+M"
 		onTriggered: clientModel.mine();
 		enabled: codeModel.hasContract && !clientModel.running && !clientModel.mining
@@ -129,6 +134,15 @@ ApplicationWindow {
 		enabled: codeModel.hasContract && !clientModel.running
 	}
 
+	Action {
+		id: toggleAssemblyDebuggingAction
+		text: qsTr("Show VM Code")
+		shortcut: "Ctrl+Alt+V"
+		onTriggered: mainContent.rightPane.assemblyMode = !mainContent.rightPane.assemblyMode;
+		checked: mainContent.rightPane.assemblyMode;
+		enabled: true
+	}
+
 	Action {
 		id: toggleWebPreviewAction
 		text: qsTr("Show Web View")
@@ -165,15 +179,6 @@ ApplicationWindow {
 		onTriggered: mainContent.toggleWebPreviewOrientation();
 	}
 
-	Action {
-		id: toggleCallsInLog
-		text: qsTr("Show Calls in Transaction Log")
-		shortcut: ""
-		checkable: true
-		checked: mainContent.rightPane.transactionLog.showLogs
-		onTriggered: mainContent.rightPane.transactionLog.showLogs = !mainContent.rightPane.transactionLog.showLogs
-	}
-
 	Action {
 		id: toggleRunOnLoadAction
 		text: qsTr("Load State on Startup")
@@ -303,6 +308,14 @@ ApplicationWindow {
 		onTriggered: projectModel.openPrevDocument();
 	}
 
+	Action {
+		id: toggleBreakpointAction
+		text: qsTr("Toggle Breakpoint")
+		shortcut: "F9"
+		enabled: mainContent.codeEditor.editingContract();
+		onTriggered: mainContent.toggleBreakpoint();
+	}
+
 	Action {
 		id: deployViaRpcAction
 		text: qsTr("Deploy to Network")

mix/res.qrc

@@ -102,5 +102,6 @@
         <file>qml/WebPreviewStyle.qml</file>
         <file>qml/img/available_updates.png</file>
         <file>qml/DeploymentDialog.qml</file>
+        <file>qml/img/search_filled.png</file>
     </qresource>
 </RCC>

test/SolidityEndToEndTest.cpp

@@ -2768,6 +2768,248 @@ BOOST_AUTO_TEST_CASE(dynamic_out_of_bounds_array_access)
 	BOOST_CHECK(callContractFunction("length()") == encodeArgs(4));
 }
 
+BOOST_AUTO_TEST_CASE(fixed_array_cleanup)
+{
+	char const* sourceCode = R"(
+		contract c {
+			uint spacer1;
+			uint spacer2;
+			uint[20] data;
+			function fill() {
+				for (uint i = 0; i < data.length; ++i) data[i] = i+1;
+			}
+			function clear() { delete data; }
+		}
+	)";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(m_state.storage(m_contractAddress).empty());
+	BOOST_CHECK(callContractFunction("fill()") == bytes());
+	BOOST_CHECK(!m_state.storage(m_contractAddress).empty());
+	BOOST_CHECK(callContractFunction("clear()") == bytes());
+	BOOST_CHECK(m_state.storage(m_contractAddress).empty());
+}
+
+BOOST_AUTO_TEST_CASE(short_fixed_array_cleanup)
+{
+	char const* sourceCode = R"(
+		contract c {
+			uint spacer1;
+			uint spacer2;
+			uint[3] data;
+			function fill() {
+				for (uint i = 0; i < data.length; ++i) data[i] = i+1;
+			}
+			function clear() { delete data; }
+		}
+	)";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(m_state.storage(m_contractAddress).empty());
+	BOOST_CHECK(callContractFunction("fill()") == bytes());
+	BOOST_CHECK(!m_state.storage(m_contractAddress).empty());
+	BOOST_CHECK(callContractFunction("clear()") == bytes());
+	BOOST_CHECK(m_state.storage(m_contractAddress).empty());
+}
+
+BOOST_AUTO_TEST_CASE(dynamic_array_cleanup)
+{
+	char const* sourceCode = R"(
+		contract c {
+			uint[20] spacer;
+			uint[] dynamic;
+			function fill() {
+				dynamic.length = 21;
+				for (uint i = 0; i < dynamic.length; ++i) dynamic[i] = i+1;
+			}
+			function halfClear() { dynamic.length = 5; }
+			function fullClear() { delete dynamic; }
+		}
+	)";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(m_state.storage(m_contractAddress).empty());
+	BOOST_CHECK(callContractFunction("fill()") == bytes());
+	BOOST_CHECK(!m_state.storage(m_contractAddress).empty());
+	BOOST_CHECK(callContractFunction("halfClear()") == bytes());
+	BOOST_CHECK(!m_state.storage(m_contractAddress).empty());
+	BOOST_CHECK(callContractFunction("fullClear()") == bytes());
+	BOOST_CHECK(m_state.storage(m_contractAddress).empty());
+}
+
+BOOST_AUTO_TEST_CASE(dynamic_multi_array_cleanup)
+{
+	char const* sourceCode = R"(
+		contract c {
+			struct s { uint[][] d; }
+			s[] data;
+			function fill() returns (uint) {
+				data.length = 3;
+				data[2].d.length = 4;
+				data[2].d[3].length = 5;
+				data[2].d[3][4] = 8;
+				return data[2].d[3][4];
+			}
+			function clear() { delete data; }
+		}
+	)";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(m_state.storage(m_contractAddress).empty());
+	BOOST_CHECK(callContractFunction("fill()") == encodeArgs(8));
+	BOOST_CHECK(!m_state.storage(m_contractAddress).empty());
+	BOOST_CHECK(callContractFunction("clear()") == bytes());
+	BOOST_CHECK(m_state.storage(m_contractAddress).empty());
+}
+
+BOOST_AUTO_TEST_CASE(array_copy_storage_storage_dyn_dyn)
+{
+	char const* sourceCode = R"(
+		contract c {
+			uint[] data1;
+			uint[] data2;
+			function setData1(uint length, uint index, uint value) {
+				data1.length = length; if (index < length) data1[index] = value;
+			}
+			function copyStorageStorage() { data2 = data1; }
+			function getData2(uint index) returns (uint len, uint val) {
+				len = data2.length; if (index < len) val = data2[index];
+			}
+		}
+	)";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(callContractFunction("setData1(uint256,uint256,uint256)", 10, 5, 4) == bytes());
+	BOOST_CHECK(callContractFunction("copyStorageStorage()") == bytes());
+	BOOST_CHECK(callContractFunction("getData2(uint256)", 5) == encodeArgs(10, 4));
+	BOOST_CHECK(callContractFunction("setData1(uint256,uint256,uint256)", 0, 0, 0) == bytes());
+	BOOST_CHECK(callContractFunction("copyStorageStorage()") == bytes());
+	BOOST_CHECK(callContractFunction("getData2(uint256)", 0) == encodeArgs(0, 0));
+	BOOST_CHECK(m_state.storage(m_contractAddress).empty());
+}
+
+BOOST_AUTO_TEST_CASE(array_copy_storage_storage_static_static)
+{
+	char const* sourceCode = R"(
+		contract c {
+			uint[40] data1;
+			uint[20] data2;
+			function test() returns (uint x, uint y){
+				data1[30] = 4;
+				data1[2] = 7;
+				data1[3] = 9;
+				data2[3] = 8;
+				data1 = data2;
+				x = data1[3];
+				y = data1[30]; // should be cleared
+			}
+		}
+	)";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(callContractFunction("test()") == encodeArgs(8, 0));
+}
+
+BOOST_AUTO_TEST_CASE(array_copy_storage_storage_static_dynamic)
+{
+	char const* sourceCode = R"(
+		contract c {
+			uint[9] data1;
+			uint[] data2;
+			function test() returns (uint x, uint y){
+				data1[8] = 4;
+				data2 = data1;
+				x = data2.length;
+				y = data2[8];
+			}
+		}
+	)";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(callContractFunction("test()") == encodeArgs(9, 4));
+}
+
+BOOST_AUTO_TEST_CASE(array_copy_storage_storage_struct)
+{
+	char const* sourceCode = R"(
+		contract c {
+			struct Data { uint x; uint y; }
+			Data[] data1;
+			Data[] data2;
+			function test() returns (uint x, uint y) {
+				data1.length = 9;
+				data1[8].x = 4;
+				data1[8].y = 5;
+				data2 = data1;
+				x = data2[8].x;
+				y = data2[8].y;
+				data1.length = 0;
+				data2 = data1;
+			}
+		}
+	)";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(callContractFunction("test()") == encodeArgs(4, 5));
+	BOOST_CHECK(m_state.storage(m_contractAddress).empty());
+}
+
+BOOST_AUTO_TEST_CASE(pass_dynamic_arguments_to_the_base)
+{
+	char const* sourceCode = R"(
+		contract Base {
+			function Base(uint i)
+			{
+				m_i = i;
+			}
+			uint public m_i;
+		}
+		contract Derived is Base(2) {
+			function Derived(uint i) Base(i)
+			{}
+		}
+		contract Final is Derived(4) {
+		})";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(callContractFunction("m_i()") == encodeArgs(4));
+}
+
+BOOST_AUTO_TEST_CASE(pass_dynamic_arguments_to_the_base_base)
+{
+	char const* sourceCode = R"(
+		contract Base {
+			function Base(uint j)
+			{
+				m_i = j;
+			}
+			uint public m_i;
+		}
+		contract Base1 is Base(3) {
+			function Base1(uint k) Base(k*k) {}
+		}
+		contract Derived is Base(3), Base1(2) {
+			function Derived(uint i) Base(i) Base1(i)
+			{}
+		}
+		contract Final is Derived(4) {
+		})";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(callContractFunction("m_i()") == encodeArgs(4));
+}
+
+BOOST_AUTO_TEST_CASE(pass_dynamic_arguments_to_the_base_base_with_gap)
+{
+	char const* sourceCode = R"(
+		contract Base {
+			function Base(uint i)
+			{
+				m_i = i;
+			}
+			uint public m_i;
+		}
+		contract Base1 is Base(3) {}
+		contract Derived is Base(2), Base1 {
+			function Derived(uint i) Base(i) {}
+		}
+		contract Final is Derived(4) {
+		})";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(callContractFunction("m_i()") == encodeArgs(4));
+}
+
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }

test/SolidityNameAndTypeResolution.cpp

@@ -436,7 +436,7 @@ BOOST_AUTO_TEST_CASE(inheritance_diamond_basic)
 			function g() { f(); rootFunction(); }
 		}
 	)";
-	BOOST_CHECK_NO_THROW(parseTextAndResolveNames(text));
+	BOOST_CHECK_NO_THROW(parseTextAndResolveNamesWithChecks(text));
 }
 
 BOOST_AUTO_TEST_CASE(cyclic_inheritance)
@@ -720,6 +720,58 @@ BOOST_AUTO_TEST_CASE(private_state_variable)
 	BOOST_CHECK_MESSAGE(function == nullptr, "Accessor function of an internal variable should not exist");
 }
 
+BOOST_AUTO_TEST_CASE(base_class_state_variable_accessor)
+{
+	// test for issue #1126 https://github.com/ethereum/cpp-ethereum/issues/1126
+	char const* text = "contract Parent {\n"
+					   "    uint256 public m_aMember;\n"
+					   "}\n"
+					   "contract Child is Parent{\n"
+					   "    function foo() returns (uint256) { return Parent.m_aMember; }\n"
+					   "}\n";
+	BOOST_CHECK_NO_THROW(parseTextAndResolveNamesWithChecks(text));
+}
+
+BOOST_AUTO_TEST_CASE(base_class_state_variable_internal_member)
+{
+	char const* text = "contract Parent {\n"
+					   "    uint256 internal m_aMember;\n"
+					   "}\n"
+					   "contract Child is Parent{\n"
+					   "    function foo() returns (uint256) { return Parent.m_aMember; }\n"
+					   "}\n";
+	BOOST_CHECK_NO_THROW(parseTextAndResolveNamesWithChecks(text));
+}
+
+BOOST_AUTO_TEST_CASE(state_variable_member_of_wrong_class1)
+{
+	char const* text = "contract Parent1 {\n"
+					   "    uint256 internal m_aMember1;\n"
+					   "}\n"
+					   "contract Parent2 is Parent1{\n"
+					   "    uint256 internal m_aMember2;\n"
+					   "}\n"
+					   "contract Child is Parent2{\n"
+					   "    function foo() returns (uint256) { return Parent2.m_aMember1; }\n"
+					   "}\n";
+	BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
+}
+
+BOOST_AUTO_TEST_CASE(state_variable_member_of_wrong_class2)
+{
+	char const* text = "contract Parent1 {\n"
+					   "    uint256 internal m_aMember1;\n"
+					   "}\n"
+					   "contract Parent2 is Parent1{\n"
+					   "    uint256 internal m_aMember2;\n"
+					   "}\n"
+					   "contract Child is Parent2{\n"
+					   "    function foo() returns (uint256) { return Child.m_aMember2; }\n"
+					   "    uint256 public m_aMember3;\n"
+					   "}\n";
+	BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
+}
+
 BOOST_AUTO_TEST_CASE(fallback_function)
 {
 	char const* text = R"(
@@ -1185,6 +1237,61 @@ BOOST_AUTO_TEST_CASE(array_with_nonconstant_length)
 	BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
 }
 
+BOOST_AUTO_TEST_CASE(array_copy_with_different_types1)
+{
+	char const* text = R"(
+		contract c {
+			bytes a;
+			uint[] b;
+			function f() { b = a; }
+		})";
+	BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
+}
+
+BOOST_AUTO_TEST_CASE(array_copy_with_different_types2)
+{
+	char const* text = R"(
+		contract c {
+			uint32[] a;
+			uint8[] b;
+			function f() { b = a; }
+		})";
+	BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
+}
+
+BOOST_AUTO_TEST_CASE(array_copy_with_different_types_conversion_possible)
+{
+	char const* text = R"(
+		contract c {
+			uint32[] a;
+			uint8[] b;
+			function f() { a = b; }
+		})";
+	BOOST_CHECK_NO_THROW(parseTextAndResolveNames(text));
+}
+
+BOOST_AUTO_TEST_CASE(array_copy_with_different_types_static_dynamic)
+{
+	char const* text = R"(
+		contract c {
+			uint32[] a;
+			uint8[80] b;
+			function f() { a = b; }
+		})";
+	BOOST_CHECK_NO_THROW(parseTextAndResolveNames(text));
+}
+
+BOOST_AUTO_TEST_CASE(array_copy_with_different_types_dynamic_static)
+{
+	char const* text = R"(
+		contract c {
+			uint[] a;
+			uint[80] b;
+			function f() { b = a; }
+		})";
+	BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }

test/SolidityParser.cpp

@@ -367,6 +367,40 @@ BOOST_AUTO_TEST_CASE(variable_definition_with_initialization)
 	BOOST_CHECK_NO_THROW(parseText(text));
 }
 
+BOOST_AUTO_TEST_CASE(variable_definition_in_function_parameter)
+{
+	char const* text = R"(
+		contract test {
+			function fun(var a) {}
+		}
+	)";
+	BOOST_CHECK_THROW(parseText(text), ParserError);
+}
+
+BOOST_AUTO_TEST_CASE(variable_definition_in_mapping)
+{
+	char const* text = R"(
+		contract test {
+			function fun() {
+				mapping(var=>hash) d;
+			}
+		}
+	)";
+	BOOST_CHECK_THROW(parseText(text), ParserError);
+}
+
+BOOST_AUTO_TEST_CASE(variable_definition_in_function_return)
+{
+	char const* text = R"(
+		contract test {
+			function fun() returns(var d) {
+				return 1;
+			}
+		}
+	)";
+	BOOST_CHECK_THROW(parseText(text), ParserError);
+}
+
 BOOST_AUTO_TEST_CASE(operator_expression)
 {
 	char const* text = "contract test {\n"

test/TestHelper.cpp

@@ -139,27 +139,35 @@ void ImportTest::importState(json_spirit::mObject& _o, State& _state)
 }
 
 void ImportTest::importTransaction(json_spirit::mObject& _o)
-{
-	BOOST_REQUIRE(_o.count("nonce")> 0);
-	BOOST_REQUIRE(_o.count("gasPrice") > 0);
-	BOOST_REQUIRE(_o.count("gasLimit") > 0);
-	BOOST_REQUIRE(_o.count("to") > 0);
-	BOOST_REQUIRE(_o.count("value") > 0);
-	BOOST_REQUIRE(_o.count("secretKey") > 0);
-	BOOST_REQUIRE(_o.count("data") > 0);
-
-	if (bigint(_o["nonce"].get_str()) >= c_max256plus1)
-		BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'nonce' is equal or greater than 2**256") );
-	if (bigint(_o["gasPrice"].get_str()) >= c_max256plus1)
-		BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'gasPrice' is equal or greater than 2**256") );
-	if (bigint(_o["gasLimit"].get_str()) >= c_max256plus1)
-		BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'gasLimit' is equal or greater than 2**256") );
-	if (bigint(_o["value"].get_str()) >= c_max256plus1)
-		BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'value' is equal or greater than 2**256") );
-
-	m_transaction = _o["to"].get_str().empty() ?
-		Transaction(toInt(_o["value"]), toInt(_o["gasPrice"]), toInt(_o["gasLimit"]), importData(_o), toInt(_o["nonce"]), Secret(_o["secretKey"].get_str())) :
-		Transaction(toInt(_o["value"]), toInt(_o["gasPrice"]), toInt(_o["gasLimit"]), Address(_o["to"].get_str()), importData(_o), toInt(_o["nonce"]), Secret(_o["secretKey"].get_str()));
+{	
+	if (_o.count("secretKey") > 0)
+	{
+		BOOST_REQUIRE(_o.count("nonce") > 0);
+		BOOST_REQUIRE(_o.count("gasPrice") > 0);
+		BOOST_REQUIRE(_o.count("gasLimit") > 0);
+		BOOST_REQUIRE(_o.count("to") > 0);
+		BOOST_REQUIRE(_o.count("value") > 0);
+		BOOST_REQUIRE(_o.count("data") > 0);
+
+		if (bigint(_o["nonce"].get_str()) >= c_max256plus1)
+			BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'nonce' is equal or greater than 2**256") );
+		if (bigint(_o["gasPrice"].get_str()) >= c_max256plus1)
+			BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'gasPrice' is equal or greater than 2**256") );
+		if (bigint(_o["gasLimit"].get_str()) >= c_max256plus1)
+			BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'gasLimit' is equal or greater than 2**256") );
+		if (bigint(_o["value"].get_str()) >= c_max256plus1)
+			BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'value' is equal or greater than 2**256") );
+
+		m_transaction = _o["to"].get_str().empty() ?
+			Transaction(toInt(_o["value"]), toInt(_o["gasPrice"]), toInt(_o["gasLimit"]), importData(_o), toInt(_o["nonce"]), Secret(_o["secretKey"].get_str())) :
+			Transaction(toInt(_o["value"]), toInt(_o["gasPrice"]), toInt(_o["gasLimit"]), Address(_o["to"].get_str()), importData(_o), toInt(_o["nonce"]), Secret(_o["secretKey"].get_str()));
+	}
+	else
+	{
+		RLPStream transactionRLPStream = createRLPStreamFromTransactionFields(_o);
+		RLP transactionRLP(transactionRLPStream.out());
+		m_transaction = Transaction(transactionRLP.data(), CheckSignature::Sender);
+	}
 }
 
 void ImportTest::exportTest(bytes _output, State& _statePost)

test/block.cpp

@@ -496,11 +496,21 @@ BOOST_AUTO_TEST_CASE(blValidBlockTest)
 	dev::test::executeTests("blValidBlockTest", "/BlockTests", dev::test::doBlockTests);
 }
 
+BOOST_AUTO_TEST_CASE(blInvalidTransactionRLP)
+{
+	dev::test::executeTests("blInvalidTransactionRLP", "/BlockTests", dev::test::doBlockTests);
+}
+
 BOOST_AUTO_TEST_CASE(blInvalidHeaderTest)
 {
 	dev::test::executeTests("blInvalidHeaderTest", "/BlockTests", dev::test::doBlockTests);
 }
 
+BOOST_AUTO_TEST_CASE(blForkBlocks)
+{
+	dev::test::executeTests("blForkBlocks", "/BlockTests", dev::test::doBlockTests);
+}
+
 BOOST_AUTO_TEST_CASE(userDefinedFileBl)
 {
 	dev::test::userDefinedTest("--bltest", dev::test::doBlockTests);

test/stMemoryStressTestFiller.json

@@ -0,0 +1,69 @@
+{
+    "mload32bitBound": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "17592320524892",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 1 ]] (MLOAD 4294967296) } ",
+                "storage": {}
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "175923205248920",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "transaction" : {
+            "nonce" : "0",
+            "gasPrice" : "1",
+            "gasLimit" : "17592320524892",
+            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : "10",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "data" : ""
+        }
+    },
+
+    "mload32bitBound2": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "37791080412587",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 1 ]] (MLOAD 6294967296) } ",
+                "storage": {}
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "377910804219850",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "transaction" : {
+            "nonce" : "0",
+            "gasPrice" : "1",
+            "gasLimit" : "37791080412587",
+            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : "10",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "data" : ""
+        }
+    }
+}

test/stRefundTestFiller.json

@@ -304,33 +304,135 @@
              "data" : ""
          }
      },
-    "RefundOverflow" : {
-           "env" : {
-               "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-               "currentDifficulty" : "45678256",
-               "currentGasLimit" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-               "currentNumber" : "0",
-               "currentTimestamp" : 1,
-               "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-           },
-           "pre" : {
-               "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                   "balance" : "400",
-                   "code" : "0x",
-                   "nonce" : "0",
-                   "storage" : {
-                   }
-               }
-           },
-           "transaction" : {
-               "data" : "",
-               "gasLimit" : "5789604461865809771178549250434395392663499233282028201972879200395656482016",
-               "gasPrice" : "20",
-               "nonce" : "0",
-               "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-               "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-               "value" : ""
-           }
-       }
+    "refund_CallA" : {
+         "env" : {
+             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+             "currentNumber" : "0",
+             "currentGasLimit" : "1000000",
+             "currentDifficulty" : "256",
+             "currentTimestamp" : 1,
+             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+         },
+         "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (CALL 500 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                 "balance" : "1000000000000000000",
+                 "nonce" : "0",
+                 "code" : "{ [[ 1 ]] 0 }",
+                 "storage" : {
+                     "0x01" : "0x01"
+                 }
+             },
+             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                 "balance" : "2000",
+                 "nonce" : "0",
+                 "code" : "",
+                 "storage": {}
+             }
+         },
+         "transaction" : {
+             "nonce" : "0",
+             "gasPrice" : "1",
+             "gasLimit" : "1500",
+             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+             "value" : "10",
+             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+             "data" : ""
+         }
+     },
+
+    "refund_CallA2" : {
+         "env" : {
+             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+             "currentNumber" : "0",
+             "currentGasLimit" : "1000000",
+             "currentDifficulty" : "256",
+             "currentTimestamp" : 1,
+             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+         },
+         "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (CALL 50 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                 "balance" : "1000000000000000000",
+                 "nonce" : "0",
+                 "code" : "{ [[ 1 ]] 0 }",
+                 "storage" : {
+                     "0x01" : "0x01"
+                 }
+             },
+             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                 "balance" : "1000",
+                 "nonce" : "0",
+                 "code" : "",
+                 "storage": {}
+             }
+         },
+         "transaction" : {
+             "nonce" : "0",
+             "gasPrice" : "1",
+             "gasLimit" : "850",
+             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+             "value" : "10",
+             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+             "data" : ""
+         }
+     },
 
+    "refund_CallA_OOG" : {
+         "env" : {
+             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+             "currentNumber" : "0",
+             "currentGasLimit" : "1000000",
+             "currentDifficulty" : "256",
+             "currentTimestamp" : 1,
+             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+         },
+         "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (CALL 1 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                 "balance" : "1000000000000000000",
+                 "nonce" : "0",
+                 "code" : "{ [[ 1 ]] 0 }",
+                 "storage" : {
+                     "0x01" : "0x01"
+                 }
+             },
+             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                 "balance" : "1000",
+                 "nonce" : "0",
+                 "code" : "",
+                 "storage": {}
+             }
+         },
+         "transaction" : {
+             "nonce" : "0",
+             "gasPrice" : "1",
+             "gasLimit" : "850",
+             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+             "value" : "10",
+             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+             "data" : ""
+         }
+     }
 }

test/stSolidityTestFiller.json

@@ -525,60 +525,5 @@
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "1"
         }
-    },
-
-    "QuadraticComplexity" : {
-        "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
-            "currentGasLimit" : "100000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-        },
-        "pre" :
-        {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000",
-		"//" : "contract caller								",
-		"//" : "{									",
-		"//" : "    int value;								",
-		"//" : "    function run(int count)						",
-		"//" : "    {									",
-		"//" : "        value = count;							",
-		"//" : "        address a = 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b;		",
-		"//" : "        while(count > 0)						",
-		"//" : "        {								",
-		"//" : "            a.call('just', 'call');					",
-		"//" : "            count = count - 1;						",
-		"//" : "        }								",
-		"//" : "    }									",
-		"//" : "}									",
-		"code" : "0x60003560e060020a9004806361a4770614601557005b601e6004356024565b60006000f35b60008160008190555073b94f5374fce5edbc8e2a8697c15331677e6ebf0b90505b600082131560bf5780600160a060020a03166000600060007f6a7573740000000000000000000000000000000000000000000000000000000081526004017f63616c6c000000000000000000000000000000000000000000000000000000008152602001600060008560155a03f150506001820391506045565b505056",
-		"nonce" : "0",
-		"storage" : {
-                }
-            },
-
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "100000",
-                "code" : "{ (CALLDATACOPY 0 0 32) }",
-                "nonce" : "0",
-                "storage" : {
-                }
-            }
-        },
-        "transaction" :
-        {
-            "//" : "run(int256)",
-            "data" : "0x61a47706000000000000000000000000000000000000000000000000000000000000c350",
-            "gasLimit" : "904+68*x+e",
-            "gasLimit" : "3500000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "1"
-        }
     }
 }

test/stTransactionTestFiller.json

@@ -547,7 +547,7 @@
                 "code" : "{(CALL 0 0 1 0 0 0 0) (SUICIDE 0)}",
                 "nonce" : "0",
                 "storage" : {
-		}
+                }
             },
 
             "0000000000000000000000000000000000000000" : {
@@ -596,7 +596,7 @@
                 "code" : "{(CALL 20 0 1 0 0 0 0) (SUICIDE 0)}",
                 "nonce" : "0",
                 "storage" : {
-		}
+                }
             },
 
             "0000000000000000000000000000000000000000" : {
@@ -645,7 +645,7 @@
                 "code" : "{(SUICIDE 0) (CALL 0 2000 0 0 0 0 0) }",
                 "nonce" : "0",
                 "storage" : {
-		}
+                }
             },
 
             "0000000000000000000000000000000000000000" : {
@@ -693,7 +693,7 @@
                 "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
-		}
+                }
             }
         },
 
@@ -733,7 +733,7 @@
                 "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
-		}
+                }
             }
         },
 

test/state.cpp

@@ -159,11 +159,52 @@ BOOST_AUTO_TEST_CASE(stBlockHashTest)
 	dev::test::executeTests("stBlockHashTest", "/StateTests", dev::test::doStateTests);
 }
 
+BOOST_AUTO_TEST_CASE(stQuadraticComplexityTest)
+{
+	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
+	{
+		string arg = boost::unit_test::framework::master_test_suite().argv[i];
+		if (arg == "--quadratic" || arg == "--all")
+		{
+			auto start = chrono::steady_clock::now();
+
+			dev::test::executeTests("stQuadraticComplexityTest", "/StateTests", dev::test::doStateTests);
+
+			auto end = chrono::steady_clock::now();
+			auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
+			cnote << "test duration: " << duration.count() << " milliseconds.\n";
+		}
+	}
+}
+
+BOOST_AUTO_TEST_CASE(stMemoryStressTest)
+{
+	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
+	{
+		string arg = boost::unit_test::framework::master_test_suite().argv[i];
+		if (arg == "--memory" || arg == "--all")
+		{
+			auto start = chrono::steady_clock::now();
+
+			dev::test::executeTests("stMemoryStressTest", "/StateTests", dev::test::doStateTests);
+
+			auto end = chrono::steady_clock::now();
+			auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
+			cnote << "test duration: " << duration.count() << " milliseconds.\n";
+		}
+	}
+}
+
 BOOST_AUTO_TEST_CASE(stSolidityTest)
 {
 	dev::test::executeTests("stSolidityTest", "/StateTests", dev::test::doStateTests);
 }
 
+BOOST_AUTO_TEST_CASE(stMemoryTest)
+{
+	dev::test::executeTests("stMemoryTest", "/StateTests", dev::test::doStateTests);
+}
+
 BOOST_AUTO_TEST_CASE(stCreateTest)
 {
 	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)

test/transaction.cpp

@@ -90,8 +90,9 @@ void doTransactionTests(json_spirit::mValue& _v, bool _fillin)
 
 				o["sender"] = toString(txFromFields.sender());
 			}
-			catch(...)
+			catch(Exception const& _e)
 			{
+				cnote << "Transaction Exception: " << diagnostic_information(_e);
 				o.erase(o.find("transaction"));
 			}
 		}
@@ -115,7 +116,21 @@ BOOST_AUTO_TEST_CASE(ttWrongRLPTransaction)
 
 BOOST_AUTO_TEST_CASE(tt10mbDataField)
 {
-	dev::test::executeTests("tt10mbDataField", "/TransactionTests", dev::test::doTransactionTests);
+	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
+	{
+		string arg = boost::unit_test::framework::master_test_suite().argv[i];
+		if (arg == "--bigdata" || arg == "--all")
+		{
+			auto start = chrono::steady_clock::now();
+
+			dev::test::executeTests("tt10mbDataField", "/TransactionTests", dev::test::doTransactionTests);
+
+			auto end = chrono::steady_clock::now();
+			auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
+			cnote << "test duration: " << duration.count() << " milliseconds.\n";
+		}
+	}
+
 }
 
 BOOST_AUTO_TEST_CASE(ttCreateTest)

test/ttTransactionTestFiller.json

@@ -14,7 +14,7 @@
         }
     },
 
-    "WrongVRSTestVl27" : {
+    "WrongVRSTestVl26" : {
         "transaction" :
         {
             "data" : "",
@@ -29,6 +29,21 @@
         }
     },
 
+    "WrongVRSTestVl29" : {
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "2000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
+            "v" : "29",
+            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
+            "s" : "0x8887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
+        }
+    },
+
     "WrongVRSTestVge31" : {
         "transaction" :
         {
@@ -136,7 +151,22 @@
         }
     },
 
-    "TransactionWithSvalueOverflow" : {
+    "TransactionWithSvalueHigh" : {
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "850",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "11",
+            "v" : "27",
+            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
+            "s" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2e"
+        }
+    },
+
+    "TransactionWithSvalueTooHigh" : {
         "transaction" :
         {
             "data" : "",
@@ -151,7 +181,52 @@
         }
     },
 
+    "TransactionWithSvalueOverflow" : {
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "850",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "11",
+            "v" : "27",
+            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
+            "s" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f0000"
+        }
+    },
+
     "TransactionWithRvalueOverflow" : {
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "850",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "11",
+            "v" : "27",
+            "r" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd03641410000",
+            "s" : "0xefffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
+        }
+    },
+
+    "TransactionWithRvalueHigh" : {
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "850",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "11",
+            "v" : "27",
+            "r" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140",
+            "s" : "0x8887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
+        }
+    },
+
+    "TransactionWithRvalueTooHigh" : {
         "transaction" :
         {
             "data" : "",
@@ -166,6 +241,51 @@
         }
     },
 
+    "TransactionWithRvalueWrongSize" : {
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "850",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "11",
+            "v" : "27",
+            "r" : "0xebaaedce6af48a03bbfd25e8cd0364141",
+            "s" : "0xefffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
+        }
+    },
+
+   "TransactionWithSvalueWrongSize" : {
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "850",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "11",
+            "v" : "27",
+            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
+            "s" : "0xef0b28ad43601b4ab949f53faa07bd2c804"
+        }
+    },
+
+    "TransactionWithHihghNonce" : {
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "850",
+            "gasPrice" : "1",
+            "nonce" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "0",
+            "v" : "27",
+            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
+            "s" : "0xefffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
+        }
+    },
+
     "TransactionWithNonceOverflow" : {
         "transaction" :
         {
@@ -181,6 +301,51 @@
         }
     },
 
+    "TransactionWithHihghGas" : {
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "0",
+            "v" : "27",
+            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
+            "s" : "0xefffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
+        }
+    },
+
+   "TransactionWithHihghGasPrice" : {
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "1000",
+            "gasPrice" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "nonce" : "0",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "0",
+            "v" : "27",
+            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
+            "s" : "0xefffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
+        }
+    },
+
+   "TransactionWithGasLimitxPriceOverflow" : {
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "gasPrice" : "100000000000000000",
+            "nonce" : "0",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "0",
+            "v" : "27",
+            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
+            "s" : "0xefffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
+        }
+    },
+
     "TransactionWithGasPriceOverflow" : {
         "transaction" :
         {

test/vm.cpp

@@ -518,7 +518,7 @@ BOOST_AUTO_TEST_CASE(vmPerformanceTest)
 	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
 	{
 		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == "--performance")
+		if (arg == "--performance" || arg == "--all")
 		{
 			auto start = chrono::steady_clock::now();
 
@@ -536,7 +536,7 @@ BOOST_AUTO_TEST_CASE(vmInputLimitsTest1)
 	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
 	{
 		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == "--inputlimits")
+		if (arg == "--inputlimits" || arg == "--all")
 		{
 			auto start = chrono::steady_clock::now();
 
@@ -554,7 +554,7 @@ BOOST_AUTO_TEST_CASE(vmInputLimitsTest2)
 	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
 	{
 		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == "--inputlimits")
+		if (arg == "--inputlimits" || arg == "--all")
 			dev::test::executeTests("vmInputLimitsTest2", "/VMTests", dev::test::doVMTests);
 	}
 }

test/vmArithmeticTestFiller.json

@@ -897,7 +897,7 @@
         }
     },
 
-    "sdiv5": {
+    "sdiv_i256min": {
         "env" : {
         "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
         "currentNumber" : "0",
@@ -925,6 +925,62 @@
         }
     },
 
+    "sdiv_i256min2": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : "1",
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : "0",
+            "code" : "{ [[ 0 ]] (SDIV (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819968) (- 0 1) )  }",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "sdiv_i256min3": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : "1",
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : "0",
+            "code" : "{ [[ 0 ]] (SDIV 115792089237316195423570985008687907853269984665640564039457584007913129639935 (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819967) )  }",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
     "mod0": {
         "env" : {
         "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
@@ -1205,6 +1261,90 @@
         }
     },
 
+    "smod5": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : "1",
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : "0",
+            "code" : "{ [[ 0 ]] (SMOD (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819967) 57896044618658097711785492504343953926634992332820282019728792003956564819967)}",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "smod6": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : "1",
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : "0",
+            "code" : "{ [[ 0 ]] (SMOD (- 0 115792089237316195423570985008687907853269984665640564039457584007913129639935) 57896044618658097711785492504343953926634992332820282019728792003956564819967)}",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "smod7": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : "1",
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : "0",
+            "code" : "{ [[ 0 ]] (SMOD (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819967) 115792089237316195423570985008687907853269984665640564039457584007913129639935)}",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
     "addmod0": {
         "env" : {
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
@@ -1261,6 +1401,118 @@
         }
     },
 
+    "addmod1_overflowDiff": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (ADDMOD (- 0 1) (- 0 2) 5) } ",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "addmod1_overflow2": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (ADDMOD (- 0 1) 0 5) } ",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "addmod1_overflow3": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (ADDMOD (- 0 1) 1 5) } ",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "addmod1_overflow3": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (ADDMOD (- 0 1) 2 5) } ",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
     "addmod2": {
         "env" : {
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
@@ -1542,6 +1794,118 @@
         }
     },
 
+    "mulmod1_overflow": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (MULMOD (- 0 1) 2 5) } ",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "mulmod1_overflow2": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (MULMOD 57896044618658097711785492504343953926634992332820282019728792003956564819968 2 5) } ",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "mulmod1_overflow3": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (MULMOD 57896044618658097711785492504343953926634992332820282019728792003956564819967 2 5) } ",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "mulmod1_overflow4": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (MULMOD 57896044618658097711785492504343953926634992332820282019728792003956564819969 2 5) } ",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
     "mulmod2": {
         "env" : {
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",

test/vmEnvironmentalInfoTestFiller.json

@@ -703,6 +703,174 @@
         }
     },
 
+    "calldatacopy0_return": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ (CALLDATACOPY 0 1 2 ) (RETURN 0 (MSIZE))}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "calldatacopyZeroMemExpansion_return": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ (CALLDATACOPY 0 0 0 ) (RETURN 0 (MSIZE))}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "calldatacopy_DataIndexTooHigh_return": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ (CALLDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 0xff ) (RETURN 0 (MSIZE))}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "calldatacopy_DataIndexTooHigh2_return": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ (CALLDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 9 ) (RETURN 0 (MSIZE))}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "calldatacopy1_return": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ (CALLDATACOPY 0 1 1 ) (RETURN 0 (MSIZE))}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "calldatacopy2_return": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ (CALLDATACOPY 0 1 0 ) (RETURN 0 (MSIZE))}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
     "codesize": {
         "env" : {
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",

test/vmIOandFlowOperationsTestFiller.json

@@ -727,6 +727,91 @@
         }
     },
 
+
+    "jumpTo1InstructionafterJump": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : "1",
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : "0",
+            "code" : "0x6003565b6001600055",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "jumpTo1InstructionafterJump_noJumpDest": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : "1",
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : "0",
+            "code" : "0x6003566001600055",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "jumpTo1InstructionafterJump_jumpdestFirstInstruction": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : "1",
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : "0",
+            "code" : "0x5b6003565b6001600055",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
     "jumpDynamicJumpSameDest": {
         "env" : {
         "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",

test/vmSha3TestFiller.json

@@ -201,13 +201,13 @@
             "currentNumber" : "0",
             "currentGasLimit" : "1000000",
             "currentDifficulty" : "256",
-            "currentTimestamp" : 1,
+            "currentTimestamp" : "1",
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "nonce" : 0,
+                "nonce" : "0",
                 "code" : "{ [[ 0 ]] (SHA3 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}",
                 "storage": {}
             }
@@ -229,13 +229,13 @@
             "currentNumber" : "0",
             "currentGasLimit" : "1000000",
             "currentDifficulty" : "256",
-            "currentTimestamp" : 1,
+            "currentTimestamp" : "1",
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "nonce" : 0,
+                "nonce" : "0",
                 "code" : "{ [[ 0 ]] (SHA3 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 2)}",
                 "storage": {}
             }
@@ -257,13 +257,13 @@
             "currentNumber" : "0",
             "currentGasLimit" : "1000000",
             "currentDifficulty" : "256",
-            "currentTimestamp" : 1,
+            "currentTimestamp" : "1",
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "nonce" : 0,
+                "nonce" : "0",
                 "code" : "{ [[ 0 ]] (SHA3 0x1000000 2)}",
                 "storage": {}
             }
@@ -277,5 +277,229 @@
             "gasPrice" : "1",
             "gas" : "0x100000000"
         }
-    }
+    },
+
+    "sha3_memSizeNoQuadraticCost31": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (SHA3 960 1)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "data" : "",
+            "gasPrice" : "1",
+            "gas" : "0x100000000"
+        }
+    },
+
+    "sha3_memSizeQuadraticCost32": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (SHA3 992 1)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "data" : "",
+            "gasPrice" : "1",
+            "gas" : "0x100000000"
+        }
+    },
+
+    "sha3_memSizeQuadraticCost32_zeroSize": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (SHA3 1024 0)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "data" : "",
+            "gasPrice" : "1",
+            "gas" : "0x100000000"
+        }
+    },
+
+    "sha3_memSizeQuadraticCost33": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (SHA3 1024 1)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "data" : "",
+            "gasPrice" : "1",
+            "gas" : "0x100000000"
+        }
+    },
+
+    "sha3_memSizeQuadraticCost63": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (SHA3 1984 1)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "data" : "",
+            "gasPrice" : "1",
+            "gas" : "0x100000000"
+        }
+    },
+
+    "sha3_memSizeQuadraticCost64": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (SHA3 2016 1)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "data" : "",
+            "gasPrice" : "1",
+            "gas" : "0x100000000"
+        }
+    },
+
+    "sha3_memSizeQuadraticCost64_2": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (SHA3 2016 32)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "data" : "",
+            "gasPrice" : "1",
+            "gas" : "0x100000000"
+        }
+    },
+
+    "sha3_memSizeQuadraticCost65": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (SHA3 2048 1)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "data" : "",
+            "gasPrice" : "1",
+            "gas" : "0x100000000"
+        }
+    },
 }