diff --git a/.gitignore b/.gitignore
index 8d8974809..43ed10adf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,6 +64,8 @@ profile
 DerivedData
 project.pbxproj
 
+# JetBrains stuff
+.idea/
 
 doc/html
 *.autosave
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4603bb898..e7e89a5a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,8 @@ function(createDefaultCacheConfig)
 	set(FATDB OFF CACHE BOOL "Build with ability to list entries in the Trie. Doubles DB size, slows everything down, but good for looking at state diffs and trie contents.")
 	set(JUSTTESTS OFF CACHE BOOL "Build only for tests.")
 	set(SOLIDITY ON CACHE BOOL "Build the Solidity language components (requried unless HEADLESS)")
+	set(USENPM OFF CACHE BOOL "Use npm to recompile ethereum.js if it was changed")
+	set(ETHASHCL OFF CACHE BOOL "Build in support for GPU mining via OpenCL")
 endfunction()
 
 
@@ -43,6 +45,10 @@ function(configureProject)
 		endif ()
 	endif ()
 
+	if (ETHASHCL)
+		add_definitions(-DETH_ETHASHCL)
+	endif()
+
 	if (EVMJIT)
 		add_definitions(-DETH_EVMJIT)
 	endif()
@@ -125,7 +131,7 @@ configureProject()
 set (ETH_HAVE_WEBENGINE 1)
 
 message(STATUS "CMAKE_VERSION: ${CMAKE_VERSION}")
-message("-- VMTRACE: ${VMTRACE}; PARANOIA: ${PARANOIA}; HEADLESS: ${HEADLESS}; JSONRPC: ${JSONRPC}; EVMJIT: ${EVMJIT}; FATDB: ${FATDB}; CHROMIUM: ${ETH_HAVE_WEBENGINE}")
+message("-- VMTRACE: ${VMTRACE}; PARANOIA: ${PARANOIA}; HEADLESS: ${HEADLESS}; JSONRPC: ${JSONRPC}; EVMJIT: ${EVMJIT}; FATDB: ${FATDB}; CHROMIUM: ${ETH_HAVE_WEBENGINE}; USENPM: ${USENPM}; ETHASHCL: ${ETHASHCL}")
 
 
 # Default TARGET_PLATFORM to "linux".
@@ -180,6 +186,10 @@ add_subdirectory(libdevcrypto)
 add_subdirectory(libwhisper)
 
 add_subdirectory(libethash)
+if (ETHASHCL)
+	add_subdirectory(libethash-cl)
+endif ()
+
 add_subdirectory(libethcore)
 add_subdirectory(libevm)
 add_subdirectory(libethereum)
diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp
index ab8e07e7c..5d4f9770e 100644
--- a/alethzero/MainWin.cpp
+++ b/alethzero/MainWin.cpp
@@ -263,7 +263,7 @@ unsigned Main::installWatch(LogFilter const& _tf, WatchHandler const& _f)
 
 unsigned Main::installWatch(dev::h256 _tf, WatchHandler const& _f)
 {
-	auto ret = ethereum()->installWatch(_tf);
+	auto ret = ethereum()->installWatch(_tf, Reaping::Manual);
 	m_handlers[ret] = _f;
 	return ret;
 }
@@ -478,10 +478,83 @@ QString Main::pretty(dev::Address _a) const
 	return fromRaw(n);
 }
 
+template <size_t N> inline string toBase36(FixedHash<N> const& _h)
+{
+	static char const* c_alphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+	typename FixedHash<N>::Arith a = _h;
+	std::string ret;
+	for (; a > 0; a /= 36)
+		ret = c_alphabet[(unsigned)a % 36] + ret;
+	return ret;
+}
+
+template <size_t N> inline FixedHash<N> fromBase36(string const& _h)
+{
+	typename FixedHash<N>::Arith ret = 0;
+	for (char c: _h)
+		ret = ret * 36 + (c < 'A' ? c - '0' : (c - 'A' + 10));
+	return ret;
+}
+
+static string iban(std::string _c, std::string _d)
+{
+	boost::to_upper(_c);
+	boost::to_upper(_d);
+	auto totStr = _d + _c + "00";
+	bigint tot = 0;
+	for (char x: totStr)
+		if (x >= 'A')
+			tot = tot * 100 + x - 'A' + 10;
+		else
+			tot = tot * 10 + x - '0';
+	unsigned check = (unsigned)(u256)(98 - tot % 97);
+	ostringstream out;
+	out << _c << setfill('0') << setw(2) << check << _d;
+	return out.str();
+}
+
+static std::pair<string, string> fromIban(std::string _iban)
+{
+	if (_iban.size() < 4)
+		return std::make_pair(string(), string());
+	boost::to_upper(_iban);
+	std::string c = _iban.substr(0, 2);
+	std::string d = _iban.substr(4);
+	if (iban(c, d) != _iban)
+		return std::make_pair(string(), string());
+	return make_pair(c, d);
+}
+
+static string directICAP(dev::Address _a)
+{
+	if (!!_a[0])
+		return string();
+	std::string d = toBase36<Address::size>(_a);
+	while (d.size() < 30)
+		d = "0" + d;
+	return iban("XE", d);
+}
+
+static Address fromICAP(std::string const& _s)
+{
+	std::string country;
+	std::string data;
+	std::tie(country, data) = fromIban(_s);
+	if (country.empty())
+		return Address();
+	if (country == "XE" && data.size() == 30)
+		// Direct ICAP
+		return fromBase36<Address::size>(data);
+	// TODO: Indirect ICAP
+	return Address();
+}
+
 QString Main::render(dev::Address _a) const
 {
 	QString p = pretty(_a);
-	if (!p.isNull())
+	if (!_a[0])
+		p += QString(p.isEmpty() ? "" : " ") + QString::fromStdString(directICAP(_a));
+	if (!p.isEmpty())
 		return p + " (" + QString::fromStdString(_a.abridged()) + ")";
 	return QString::fromStdString(_a.abridged());
 }
@@ -524,6 +597,8 @@ Address Main::fromString(QString const& _n) const
 			return Address();
 		}
 	}
+	else if (Address a = fromICAP(_n.toStdString()))
+		return a;
 	else
 		return Address();
 }
@@ -1000,7 +1075,7 @@ void Main::refreshBlockChain()
 	// TODO: keep the same thing highlighted.
 	// TODO: refactor into MVC
 	// TODO: use get by hash/number
-	// TODO: transactions, log addresses, log topics
+	// TODO: transactions
 
 	auto const& bc = ethereum()->blockChain();
 	QStringList filters = ui->blockChainFilter->text().toLower().split(QRegExp("\\s+"), QString::SkipEmptyParts);
@@ -1012,15 +1087,17 @@ void Main::refreshBlockChain()
 			h256 h(f.toStdString());
 			if (bc.isKnown(h))
 				blocks.insert(h);
+			for (auto const& b: bc.withBlockBloom(LogBloom().shiftBloom<3>(sha3(h)), 0, -1))
+				blocks.insert(bc.numberHash(b));
 		}
 		else if (f.toLongLong() <= bc.number())
 			blocks.insert(bc.numberHash(u256(f.toLongLong())));
-		/*else if (f.size() == 40)
+		else if (f.size() == 40)
 		{
-			Address h(f[0]);
-			if (bc.(h))
-				blocks.insert(h);
-		}*/
+			Address h(f.toStdString());
+			for (auto const& b: bc.withBlockBloom(LogBloom().shiftBloom<3>(sha3(h)), 0, -1))
+				blocks.insert(bc.numberHash(b));
+		}
 
 	QByteArray oldSelected = ui->blocks->count() ? ui->blocks->currentItem()->data(Qt::UserRole).toByteArray() : QByteArray();
 	ui->blocks->clear();
@@ -1169,7 +1246,7 @@ void Main::timerEvent(QTimerEvent*)
 
 	for (auto const& i: m_handlers)
 	{
-		auto ls = ethereum()->checkWatch(i.first);
+		auto ls = ethereum()->checkWatchSafe(i.first);
 		if (ls.size())
 		{
 			cnote << "FIRING WATCH" << i.first << ls.size();
@@ -1274,7 +1351,10 @@ void Main::on_transactionQueue_currentItemChanged()
 		}
 		s << "<div>Hex: " Span(Mono) << toHex(tx.rlp()) << "</span></div>";
 		s << "<hr/>";
-		s << "<div>Log Bloom: " << receipt.bloom() << "</div>";
+		if (!!receipt.bloom())
+			s << "<div>Log Bloom: " << receipt.bloom() << "</div>";
+		else
+			s << "<div>Log Bloom: <i>Uneventful</i></div>";
 		auto r = receipt.rlp();
 		s << "<div>Receipt: " << toString(RLP(r)) << "</div>";
 		s << "<div>Receipt-Hex: " Span(Mono) << toHex(receipt.rlp()) << "</span></div>";
@@ -1349,11 +1429,11 @@ void Main::on_blocks_currentItemChanged()
 			s << "<h3>" << h << "</h3>";
 			s << "<h4>#" << info.number;
 			s << "&nbsp;&emsp;&nbsp;<b>" << timestamp << "</b></h4>";
-			s << "<br/>D/TD: <b>2^" << log2((double)info.difficulty) << "</b>/<b>2^" << log2((double)details.totalDifficulty) << "</b>";
+			s << "<br/>D/TD: <b>" << info.difficulty << "</b>/<b>" << details.totalDifficulty << "</b> = 2^" << log2((double)info.difficulty) << "/2^" << log2((double)details.totalDifficulty);
 			s << "&nbsp;&emsp;&nbsp;Children: <b>" << details.children.size() << "</b></h5>";
 			s << "<br/>Gas used/limit: <b>" << info.gasUsed << "</b>/<b>" << info.gasLimit << "</b>";
 			s << "<br/>Coinbase: <b>" << pretty(info.coinbaseAddress).toHtmlEscaped().toStdString() << "</b> " << info.coinbaseAddress;
-			s << "<br/>Seed hash: <b>" << info.seedHash << "</b>";
+			s << "<br/>Seed hash: <b>" << info.seedHash() << "</b>";
 			s << "<br/>Mix hash: <b>" << info.mixHash << "</b>";
 			s << "<br/>Nonce: <b>" << info.nonce << "</b>";
 			s << "<br/>Hash w/o nonce: <b>" << info.headerHash(WithoutNonce) << "</b>";
@@ -1362,12 +1442,18 @@ void Main::on_blocks_currentItemChanged()
 			{
 				auto e = Ethasher::eval(info);
 				s << "<br/>Proof-of-Work: <b>" << e.value << " &lt;= " << (h256)u256((bigint(1) << 256) / info.difficulty) << "</b> (mixhash: " << e.mixHash.abridged() << ")";
+				s << "<br/>Parent: <b>" << info.parentHash << "</b>";
 			}
 			else
+			{
 				s << "<br/>Proof-of-Work: <i>Phil has nothing to prove</i>";
-			s << "<br/>Parent: <b>" << info.parentHash << "</b>";
+				s << "<br/>Parent: <i>It was a virgin birth</i>";
+			}
 //			s << "<br/>Bloom: <b>" << details.bloom << "</b>";
-			s << "<br/>Log Bloom: <b>" << info.logBloom << "</b>";
+			if (!!info.logBloom)
+				s << "<div>Log Bloom: " << info.logBloom << "</div>";
+			else
+				s << "<div>Log Bloom: <i>Uneventful</i></div>";
 			s << "<br/>Transactions: <b>" << block[1].itemCount() << "</b> @<b>" << info.transactionsRoot << "</b>";
 			s << "<br/>Receipts: @<b>" << info.receiptsRoot << "</b>:";
 			s << "<br/>Uncles: <b>" << block[2].itemCount() << "</b> @<b>" << info.sha3Uncles << "</b>";
@@ -1379,7 +1465,7 @@ void Main::on_blocks_currentItemChanged()
 				s << line << "Parent: <b>" << uncle.parentHash << "</b>";
 				s << line << "Number: <b>" << uncle.number << "</b>";
 				s << line << "Coinbase: <b>" << pretty(uncle.coinbaseAddress).toHtmlEscaped().toStdString() << "</b> " << uncle.coinbaseAddress;
-				s << line << "Seed hash: <b>" << uncle.seedHash << "</b>";
+				s << line << "Seed hash: <b>" << uncle.seedHash() << "</b>";
 				s << line << "Mix hash: <b>" << uncle.mixHash << "</b>";
 				s << line << "Nonce: <b>" << uncle.nonce << "</b>";
 				s << line << "Hash w/o nonce: <b>" << uncle.headerHash(WithoutNonce) << "</b>";
@@ -1424,23 +1510,23 @@ void Main::on_blocks_currentItemChanged()
 			s << "<br/>R: <b>" << hex << nouppercase << tx.signature().r << "</b>";
 			s << "<br/>S: <b>" << hex << nouppercase << tx.signature().s << "</b>";
 			s << "<br/>Msg: <b>" << tx.sha3(eth::WithoutSignature) << "</b>";
-			if (tx.isCreation())
+			if (!tx.data().empty())
 			{
-				if (tx.data().size())
+				if (tx.isCreation())
 					s << "<h4>Code</h4>" << disassemble(tx.data());
-			}
-			else
-			{
-				if (tx.data().size())
-					s << dev::memDump(tx.data(), 16, true);
+				else
+					s << "<h4>Data</h4>" << dev::memDump(tx.data(), 16, true);
 			}
 			s << "<div>Hex: " Span(Mono) << toHex(block[1][txi].data()) << "</span></div>";
 			s << "<hr/>";
-			s << "<div>Log Bloom: " << receipt.bloom() << "</div>";
+			if (!!receipt.bloom())
+				s << "<div>Log Bloom: " << receipt.bloom() << "</div>";
+			else
+				s << "<div>Log Bloom: <i>Uneventful</i></div>";
 			auto r = receipt.rlp();
 			s << "<div>Receipt: " << toString(RLP(r)) << "</div>";
 			s << "<div>Receipt-Hex: " Span(Mono) << toHex(receipt.rlp()) << "</span></div>";
-			s << renderDiff(ethereum()->diff(txi, h));
+			s << "<h4>Diff</h4>" << renderDiff(ethereum()->diff(txi, h));
 			ui->debugCurrent->setEnabled(true);
 			ui->debugDumpState->setEnabled(true);
 			ui->debugDumpStatePre->setEnabled(true);
@@ -1708,9 +1794,9 @@ bool beginsWith(Address _a, bytes const& _b)
 void Main::on_newAccount_triggered()
 {
 	bool ok = true;
-	enum { NoVanity = 0, FirstTwo, FirstTwoNextTwo, FirstThree, FirstFour, StringMatch };
-	QStringList items = {"No vanity (instant)", "Two pairs first (a few seconds)", "Two pairs first and second (a few minutes)", "Three pairs first (a few minutes)", "Four pairs first (several hours)", "Specific hex string"};
-	unsigned v = items.QList<QString>::indexOf(QInputDialog::getItem(this, "Vanity Key?", "Would you a vanity key? This could take several hours.", items, 0, false, &ok));
+	enum { NoVanity = 0, DirectICAP, FirstTwo, FirstTwoNextTwo, FirstThree, FirstFour, StringMatch };
+	QStringList items = {"No vanity (instant)", "Direct ICAP address", "Two pairs first (a few seconds)", "Two pairs first and second (a few minutes)", "Three pairs first (a few minutes)", "Four pairs first (several hours)", "Specific hex string"};
+	unsigned v = items.QList<QString>::indexOf(QInputDialog::getItem(this, "Vanity Key?", "Would you a vanity key? This could take several hours.", items, 1, false, &ok));
 	if (!ok)
 		return;
 
@@ -1736,6 +1822,7 @@ void Main::on_newAccount_triggered()
 			lp = KeyPair::create();
 			auto a = lp.address();
 			if (v == NoVanity ||
+				(v == DirectICAP && !a[0]) ||
 				(v == FirstTwo && a[0] == a[1]) ||
 				(v == FirstTwoNextTwo && a[0] == a[1] && a[2] == a[3]) ||
 				(v == FirstThree && a[0] == a[1] && a[1] == a[2]) ||
diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake
index 645942998..ea272da56 100644
--- a/cmake/EthDependencies.cmake
+++ b/cmake/EthDependencies.cmake
@@ -134,14 +134,24 @@ if (NOT HEADLESS)
 		message(" - windeployqt path: ${WINDEPLOYQT_APP}")
 	endif()
 
-# TODO check node && npm version
-	find_program(ETH_NODE node)
-	string(REGEX REPLACE "node" "" ETH_NODE_DIRECTORY ${ETH_NODE})
-	message(" - nodejs location : ${ETH_NODE}")
-
-	find_program(ETH_NPM npm)
-	string(REGEX REPLACE "npm" "" ETH_NPM_DIRECTORY ${ETH_NPM})
-	message(" - npm location    : ${ETH_NPM}")
+	if (USENPM)
+
+		# TODO check node && npm version
+		find_program(ETH_NODE node)
+		string(REGEX REPLACE "node" "" ETH_NODE_DIRECTORY ${ETH_NODE})
+		message(" - nodejs location : ${ETH_NODE}")
+
+		find_program(ETH_NPM npm)
+		string(REGEX REPLACE "npm" "" ETH_NPM_DIRECTORY ${ETH_NPM})
+		message(" - npm location    : ${ETH_NPM}")
+
+		if (NOT ETH_NODE)
+			message(FATAL_ERROR "node not found!")
+		endif()
+		if (NOT ETH_NPM)
+			message(FATAL_ERROR "npm not found!")
+		endif()
+	endif()
 
 endif() #HEADLESS
 
diff --git a/libdevcore/Common.cpp b/libdevcore/Common.cpp
index 431a95580..cf6bf44c4 100644
--- a/libdevcore/Common.cpp
+++ b/libdevcore/Common.cpp
@@ -27,7 +27,7 @@ using namespace dev;
 namespace dev
 {
 
-char const* Version = "0.8.2";
+char const* Version = "0.9.1";
 
 }
 
diff --git a/libdevcore/CommonIO.h b/libdevcore/CommonIO.h
index 03fc9cffc..f42f449bb 100644
--- a/libdevcore/CommonIO.h
+++ b/libdevcore/CommonIO.h
@@ -35,6 +35,7 @@
 #include <sstream>
 #include <string>
 #include <iostream>
+#include <chrono>
 #include "Common.h"
 #include "Base64.h"
 
@@ -75,6 +76,27 @@ template <class T, class U> inline std::ostream& operator<<(std::ostream& _out,
 template <class T, class U> inline std::ostream& operator<<(std::ostream& _out, std::multimap<T, U> const& _e);
 template <class _S, class _T> _S& operator<<(_S& _out, std::shared_ptr<_T> const& _p);
 
+template <class T> inline std::string toString(std::chrono::time_point<T> const& _e, std::string _format = "")
+{
+	unsigned long milliSecondsSinceEpoch = std::chrono::duration_cast<std::chrono::milliseconds>(_e.time_since_epoch()).count();
+	auto const durationSinceEpoch = std::chrono::milliseconds(milliSecondsSinceEpoch);
+	std::chrono::time_point<std::chrono::system_clock> const tpAfterDuration(durationSinceEpoch);
+
+	tm timeValue;
+	auto time = std::chrono::system_clock::to_time_t(tpAfterDuration);
+#ifdef _WIN32
+	gmtime_s(&timeValue, &time);
+#else
+	gmtime_r(&time, &timeValue);
+#endif
+
+	unsigned const millisRemainder = milliSecondsSinceEpoch % 1000;
+	char buffer[1024];
+	if (strftime(buffer, sizeof(buffer), _format.c_str(), &timeValue))
+		return std::string(buffer) + "." + (millisRemainder < 1 ? "000" : millisRemainder < 10 ? "00" : millisRemainder < 100 ? "0" : "") + std::to_string(millisRemainder) + "Z";
+	return std::string();
+}
+
 template <class S, class T>
 inline S& streamout(S& _out, std::vector<T> const& _e)
 {
diff --git a/libdevcore/CommonJS.cpp b/libdevcore/CommonJS.cpp
index f173e779e..262944b65 100644
--- a/libdevcore/CommonJS.cpp
+++ b/libdevcore/CommonJS.cpp
@@ -23,15 +23,17 @@
 
 #include "CommonJS.h"
 
+using namespace std;
+
 namespace dev
 {
 
-bytes jsToBytes(std::string const& _s)
+bytes jsToBytes(string const& _s)
 {
 	if (_s.substr(0, 2) == "0x")
 		// Hex
 		return fromHex(_s.substr(2));
-	else if (_s.find_first_not_of("0123456789") == std::string::npos)
+	else if (_s.find_first_not_of("0123456789") == string::npos)
 		// Decimal
 		return toCompactBigEndian(bigint(_s));
 	else
@@ -42,7 +44,7 @@ bytes padded(bytes _b, unsigned _l)
 {
 	while (_b.size() < _l)
 		_b.insert(_b.begin(), 0);
-	return asBytes(asString(_b).substr(_b.size() - std::max(_l, _l)));
+	return asBytes(asString(_b).substr(_b.size() - max(_l, _l)));
 }
 
 bytes paddedRight(bytes _b, unsigned _l)
@@ -54,7 +56,7 @@ bytes paddedRight(bytes _b, unsigned _l)
 bytes unpadded(bytes _b)
 {
 	auto p = asString(_b).find_last_not_of((char)0);
-	_b.resize(p == std::string::npos ? 0 : (p + 1));
+	_b.resize(p == string::npos ? 0 : (p + 1));
 	return _b;
 }
 
@@ -72,18 +74,18 @@ bytes unpadLeft(bytes _b)
 	return _b;
 }
 
-std::string fromRaw(h256 _n, unsigned* _inc)
+string fromRaw(h256 _n, unsigned* _inc)
 {
 	if (_n)
 	{
-		std::string s((char const*)_n.data(), 32);
+		string s((char const*)_n.data(), 32);
 		auto l = s.find_first_of('\0');
 		if (!l)
 			return "";
-		if (l != std::string::npos)
+		if (l != string::npos)
 		{
 			auto p = s.find_first_not_of('\0', l);
-			if (!(p == std::string::npos || (_inc && p == 31)))
+			if (!(p == string::npos || (_inc && p == 31)))
 				return "";
 			if (_inc)
 				*_inc = (byte)s[31];
diff --git a/libdevcore/CommonJS.h b/libdevcore/CommonJS.h
index d3e8e6daa..cc487d54c 100644
--- a/libdevcore/CommonJS.h
+++ b/libdevcore/CommonJS.h
@@ -38,12 +38,21 @@ template <unsigned S> std::string toJS(FixedHash<S> const& _h)
 
 template <unsigned N> std::string toJS(boost::multiprecision::number<boost::multiprecision::cpp_int_backend<N, N, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>> const& _n)
 {
-	return "0x" + toHex(toCompactBigEndian(_n));
+	return "0x" + toHex(toCompactBigEndian(_n, 1));
 }
 
-inline std::string toJS(dev::bytes const& _n)
+inline std::string toJS(bytes const& _n, std::size_t _padding = 0)
 {
-	return "0x" + dev::toHex(_n);
+	bytes n = _n;
+	n.resize(std::max<unsigned>(n.size(), _padding));
+	return "0x" + toHex(n);
+}
+
+template< typename T >std::string toJS( T const& i )
+{
+	std::stringstream stream;
+	stream << "0x" << std::hex << i;
+	return stream.str();
 }
 
 /// Convert string to byte array. Input parameters can be hex or dec. Returns empty array if invalid input e.g neither dec or hex.
@@ -74,7 +83,7 @@ template <unsigned N> FixedHash<N> jsToFixed(std::string const& _s)
 
 inline std::string jsToFixed(double _s)
 {
-	return toJS(dev::u256(_s * (double)(dev::u256(1) << 128)));
+	return toJS(u256(_s * (double)(u256(1) << 128)));
 }
 
 template <unsigned N> boost::multiprecision::number<boost::multiprecision::cpp_int_backend<N * 8, N * 8, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>> jsToInt(std::string const& _s)
@@ -92,25 +101,16 @@ template <unsigned N> boost::multiprecision::number<boost::multiprecision::cpp_i
 
 inline u256 jsToU256(std::string const& _s) { return jsToInt<32>(_s); }
 
-inline std::string jsToDecimal(std::string const& _s)
+inline int jsToInt(std::string const& _s)
 {
-	return dev::toString(jsToU256(_s));
+	if (_s.size() > 2 && _s.substr(0, 2).compare("0x") == 0)
+		return std::stoi(_s, nullptr, 16);
+	return std::stoi(_s, nullptr, 10);
 }
 
-inline std::string jsFromBinary(dev::bytes _s, unsigned _padding = 32)
-{
-	_s.resize(std::max<unsigned>(_s.size(), _padding));
-	return "0x" + dev::toHex(_s);
-}
-
-inline std::string jsFromBinary(std::string const& _s, unsigned _padding = 32)
-{
-	return jsFromBinary(asBytes(_s), _padding);
-}
-
-inline double jsFromFixed(std::string const& _s)
+inline std::string jsToDecimal(std::string const& _s)
 {
-	return (double)jsToU256(_s) / (double)(dev::u256(1) << 128);
+	return toString(jsToU256(_s));
 }
 
 }
diff --git a/libdevcore/FixedHash.h b/libdevcore/FixedHash.h
index 49c6ed2bf..f5469ada8 100644
--- a/libdevcore/FixedHash.h
+++ b/libdevcore/FixedHash.h
@@ -87,6 +87,8 @@ public:
 	bool operator!=(FixedHash const& _c) const { return m_data != _c.m_data; }
 	bool operator<(FixedHash const& _c) const { for (unsigned i = 0; i < N; ++i) if (m_data[i] < _c.m_data[i]) return true; else if (m_data[i] > _c.m_data[i]) return false; return false; }
 	bool operator>=(FixedHash const& _c) const { return !operator<(_c); }
+	bool operator<=(FixedHash const& _c) const { return operator==(_c) || operator<(_c); }
+	bool operator>(FixedHash const& _c) const { return !operator<=(_c); }
 
 	// The obvious binary operators.
 	FixedHash& operator^=(FixedHash const& _c) { for (unsigned i = 0; i < N; ++i) m_data[i] ^= _c.m_data[i]; return *this; }
@@ -154,25 +156,17 @@ public:
 		}
 	};
 
-	inline FixedHash<32> bloom() const
-	{
-		FixedHash<32> ret;
-		for (auto i: m_data)
-			ret[i / 8] |= 1 << (i % 8);
-		return ret;
-	}
-
 	template <unsigned P, unsigned M> inline FixedHash& shiftBloom(FixedHash<M> const& _h)
 	{
-		return (*this |= _h.template nbloom<P, N>());
+		return (*this |= _h.template bloom<P, N>());
 	}
 
 	template <unsigned P, unsigned M> inline bool containsBloom(FixedHash<M> const& _h)
 	{
-		return contains(_h.template nbloom<P, N>());
+		return contains(_h.template bloom<P, N>());
 	}
 
-	template <unsigned P, unsigned M> inline FixedHash<M> nbloom() const
+	template <unsigned P, unsigned M> inline FixedHash<M> bloom() const
 	{
 		static const unsigned c_bloomBits = M * 8;
 		unsigned mask = c_bloomBits - 1;
diff --git a/libdevcore/StructuredLogger.cpp b/libdevcore/StructuredLogger.cpp
index ff267ff4e..5655b332d 100644
--- a/libdevcore/StructuredLogger.cpp
+++ b/libdevcore/StructuredLogger.cpp
@@ -22,9 +22,10 @@
  */
 
 #include "StructuredLogger.h"
-#include <ctime>
 #include <boost/asio/ip/tcp.hpp>
 #include <json/json.h>
+
+#include <libdevcore/CommonIO.h>
 #include "Guards.h"
 
 namespace ba = boost::asio;
@@ -33,19 +34,6 @@ using namespace std;
 namespace dev
 {
 
-string StructuredLogger::timePointToString(chrono::system_clock::time_point const& _ts)
-{
-	// not using C++11 std::put_time due to gcc bug
-	// http://stackoverflow.com/questions/14136833/stdput-time-implementation-status-in-gcc
-
-	char buffer[64];
-	time_t time = chrono::system_clock::to_time_t(_ts);
-	tm* ptm = localtime(&time);
-	if (strftime(buffer, sizeof(buffer), get().m_timeFormat.c_str(), ptm))
-		return string(buffer);
-	return "";
-}
-
 void StructuredLogger::outputJson(Json::Value const& _value, std::string const& _name) const
 {
 	Json::Value event;
@@ -62,7 +50,7 @@ void StructuredLogger::starting(string const& _clientImpl, const char* _ethVersi
 		Json::Value event;
 		event["client_impl"] = _clientImpl;
 		event["eth_version"] = std::string(_ethVersion);
-		event["ts"] = timePointToString(std::chrono::system_clock::now());
+		event["ts"] = dev::toString(chrono::system_clock::now(), get().m_timeFormat.c_str());
 
 		get().outputJson(event, "starting");
 	}
@@ -75,7 +63,7 @@ void StructuredLogger::stopping(string const& _clientImpl, const char* _ethVersi
 		Json::Value event;
 		event["client_impl"] = _clientImpl;
 		event["eth_version"] = std::string(_ethVersion);
-		event["ts"] = timePointToString(std::chrono::system_clock::now());
+		event["ts"] = dev::toString(chrono::system_clock::now(), get().m_timeFormat.c_str());
 
 		get().outputJson(event, "stopping");
 	}
@@ -97,7 +85,7 @@ void StructuredLogger::p2pConnected(
 		event["remote_addr"] = addrStream.str();
 		event["remote_id"] = _id;
 		event["num_connections"] = Json::Value(_numConnections);
-		event["ts"] = timePointToString(_ts);
+		event["ts"] = dev::toString(_ts, get().m_timeFormat.c_str());
 
 		get().outputJson(event, "p2p.connected");
 	}
@@ -113,7 +101,7 @@ void StructuredLogger::p2pDisconnected(string const& _id, bi::tcp::endpoint cons
 		event["remote_addr"] = addrStream.str();
 		event["remote_id"] = _id;
 		event["num_connections"] = Json::Value(_numConnections);
-		event["ts"] = timePointToString(chrono::system_clock::now());
+		event["ts"] = dev::toString(chrono::system_clock::now(), get().m_timeFormat.c_str());
 
 		get().outputJson(event, "p2p.disconnected");
 	}
@@ -131,7 +119,7 @@ void StructuredLogger::minedNewBlock(
 		event["block_hash"] = _hash;
 		event["block_number"] = _blockNumber;
 		event["chain_head_hash"] = _chainHeadHash;
-		event["ts"] = timePointToString(std::chrono::system_clock::now());
+		event["ts"] = dev::toString(chrono::system_clock::now(), get().m_timeFormat.c_str());
 		event["block_prev_hash"] = _prevHash;
 
 		get().outputJson(event, "eth.miner.new_block");
@@ -152,7 +140,7 @@ void StructuredLogger::chainReceivedNewBlock(
 		event["block_number"] = _blockNumber;
 		event["chain_head_hash"] = _chainHeadHash;
 		event["remote_id"] = _remoteID;
-		event["ts"] = timePointToString(chrono::system_clock::now());
+		event["ts"] = dev::toString(chrono::system_clock::now(), get().m_timeFormat.c_str());
 		event["block_prev_hash"] = _prevHash;
 
 		get().outputJson(event, "eth.chain.received.new_block");
@@ -171,7 +159,7 @@ void StructuredLogger::chainNewHead(
 		event["block_hash"] = _hash;
 		event["block_number"] = _blockNumber;
 		event["chain_head_hash"] = _chainHeadHash;
-		event["ts"] = timePointToString(chrono::system_clock::now());
+		event["ts"] = dev::toString(chrono::system_clock::now(), get().m_timeFormat.c_str());
 		event["block_prev_hash"] = _prevHash;
 
 		get().outputJson(event, "eth.miner.new_block");
@@ -185,7 +173,7 @@ void StructuredLogger::transactionReceived(string const& _hash, string const& _r
 		Json::Value event;
 		event["tx_hash"] = _hash;
 		event["remote_id"] = _remoteId;
-		event["ts"] = timePointToString(chrono::system_clock::now());
+		event["ts"] = dev::toString(chrono::system_clock::now(), get().m_timeFormat.c_str());
 
 		get().outputJson(event, "eth.tx.received");
 	}
diff --git a/libdevcore/StructuredLogger.h b/libdevcore/StructuredLogger.h
index eea19d107..2c30541e4 100644
--- a/libdevcore/StructuredLogger.h
+++ b/libdevcore/StructuredLogger.h
@@ -98,8 +98,6 @@ private:
 	StructuredLogger(StructuredLogger const&) = delete;
 	void operator=(StructuredLogger const&) = delete;
 
-	/// @returns a string representation of a timepoint
-	static std::string timePointToString(std::chrono::system_clock::time_point const& _ts);
 	void outputJson(Json::Value const& _value, std::string const& _name) const;
 
 	bool m_enabled = false;
diff --git a/libdevcrypto/CryptoPP.cpp b/libdevcrypto/CryptoPP.cpp
index 11e4c1472..79fd62262 100644
--- a/libdevcrypto/CryptoPP.cpp
+++ b/libdevcrypto/CryptoPP.cpp
@@ -319,8 +319,7 @@ void Secp256k1::agree(Secret const& _s, Public const& _r, h256& o_s)
 	assert(d.AgreedValueLength() == sizeof(o_s));
 	byte remote[65] = {0x04};
 	memcpy(&remote[1], _r.data(), 64);
-	bool result = d.Agree(o_s.data(), _s.data(), remote);
-	assert(result);
+	d.Agree(o_s.data(), _s.data(), remote);
 }
 
 void Secp256k1::exportPublicKey(CryptoPP::DL_PublicKey_EC<CryptoPP::ECP> const& _k, Public& o_p)
diff --git a/libethash/ethash.h b/libethash/ethash.h
index 918a77413..b96e6347d 100644
--- a/libethash/ethash.h
+++ b/libethash/ethash.h
@@ -25,6 +25,17 @@
 #include <stddef.h>
 #include "compiler.h"
 
+#define ETHASH_REVISION 19
+#define ETHASH_DAGSIZE_BYTES_INIT 1073741824U // 2**30
+#define ETHASH_DAG_GROWTH 113000000U
+#define ETHASH_EPOCH_LENGTH 30000U
+#define ETHASH_MIX_BYTES 128
+#define ETHASH_DAG_PARENTS 256
+#define ETHASH_CACHE_ROUNDS 3
+#define ETHASH_ACCESSES 64
+
+// *********************
+// TODO: Remove once other code moved over to compliant naming scheme.
 #define REVISION 19
 #define DAGSIZE_BYTES_INIT 1073741824U // 2**30
 #define DAG_GROWTH 113000000U
@@ -33,6 +44,7 @@
 #define DAG_PARENTS 256
 #define CACHE_ROUNDS 3
 #define ACCESSES 64
+// *********************
 
 #ifdef __cplusplus
 extern "C" {
@@ -82,11 +94,11 @@ static inline int ethash_check_difficulty(
 	return 1;
 }
 
-int ethash_quick_check_difficulty(
+void ethash_quick_hash(
+        uint8_t return_hash[32],
         const uint8_t header_hash[32],
         const uint64_t nonce,
-        const uint8_t mix_hash[32],
-        const uint8_t difficulty[32]);
+        const uint8_t mix_hash[32]);
 
 #ifdef __cplusplus
 }
diff --git a/libethash/internal.h b/libethash/internal.h
index bcbacdaa4..d77991d56 100644
--- a/libethash/internal.h
+++ b/libethash/internal.h
@@ -37,12 +37,6 @@ void ethash_calculate_dag_item(
         ethash_cache const *cache
 );
 
-void ethash_quick_hash(
-        uint8_t return_hash[32],
-        const uint8_t header_hash[32],
-        const uint64_t nonce,
-        const uint8_t mix_hash[32]);
-
 #ifdef __cplusplus
 }
 #endif
\ No newline at end of file
diff --git a/libethcore/BlockInfo.cpp b/libethcore/BlockInfo.cpp
index 0f37294c2..f04353aac 100644
--- a/libethcore/BlockInfo.cpp
+++ b/libethcore/BlockInfo.cpp
@@ -55,12 +55,20 @@ void BlockInfo::setEmpty()
 	gasUsed = 0;
 	timestamp = 0;
 	extraData.clear();
-	seedHash = h256();
 	mixHash = h256();
 	nonce = Nonce();
+	m_seedHash = h256();
 	hash = headerHash(WithNonce);
 }
 
+h256 const& BlockInfo::seedHash() const
+{
+	if (!m_seedHash)
+		for (u256 n = number; n >= c_epochDuration; n -= c_epochDuration)
+			m_seedHash = sha3(m_seedHash);
+	return m_seedHash;
+}
+
 BlockInfo BlockInfo::fromHeader(bytesConstRef _block, Strictness _s)
 {
 	BlockInfo ret;
@@ -77,9 +85,9 @@ h256 BlockInfo::headerHash(IncludeNonce _n) const
 
 void BlockInfo::streamRLP(RLPStream& _s, IncludeNonce _n) const
 {
-	_s.appendList(_n == WithNonce ? 16 : 14)
+	_s.appendList(_n == WithNonce ? 15 : 13)
 		<< parentHash << sha3Uncles << coinbaseAddress << stateRoot << transactionsRoot << receiptsRoot << logBloom
-		<< difficulty << number << gasLimit << gasUsed << timestamp << extraData << seedHash;
+		<< difficulty << number << gasLimit << gasUsed << timestamp << extraData;
 	if (_n == WithNonce)
 		_s << mixHash << nonce;
 }
@@ -109,9 +117,8 @@ void BlockInfo::populateFromHeader(RLP const& _header, Strictness _s)
 		gasUsed = _header[field = 10].toInt<u256>();
 		timestamp = _header[field = 11].toInt<u256>();
 		extraData = _header[field = 12].toBytes();
-		seedHash = _header[field = 13].toHash<h256>(RLP::VeryStrict);
-		mixHash = _header[field = 14].toHash<h256>(RLP::VeryStrict);
-		nonce = _header[field = 15].toHash<Nonce>(RLP::VeryStrict);
+		mixHash = _header[field = 13].toHash<h256>(RLP::VeryStrict);
+		nonce = _header[field = 14].toHash<Nonce>(RLP::VeryStrict);
 	}
 
 	catch (Exception const& _e)
@@ -185,23 +192,18 @@ void BlockInfo::populateFromParent(BlockInfo const& _parent)
 	stateRoot = _parent.stateRoot;
 	parentHash = _parent.hash;
 	number = _parent.number + 1;
-	gasLimit = calculateGasLimit(_parent);
+	gasLimit = selectGasLimit(_parent);
 	gasUsed = 0;
 	difficulty = calculateDifficulty(_parent);
-	seedHash = calculateSeedHash(_parent);
 }
 
-h256 BlockInfo::calculateSeedHash(BlockInfo const& _parent) const
-{
-	return number % c_epochDuration == 0 ? sha3(_parent.seedHash.asBytes()) : _parent.seedHash;
-}
-
-u256 BlockInfo::calculateGasLimit(BlockInfo const& _parent) const
+u256 BlockInfo::selectGasLimit(BlockInfo const& _parent) const
 {
 	if (!parentHash)
 		return c_genesisGasLimit;
 	else
-		return max<u256>(c_minGasLimit, (_parent.gasLimit * (c_gasLimitBoundDivisor - 1) + (_parent.gasUsed * 6 / 5)) / c_gasLimitBoundDivisor);
+		// target minimum of 3141592
+		return max<u256>(max<u256>(c_minGasLimit, 3141592), (_parent.gasLimit * (c_gasLimitBoundDivisor - 1) + (_parent.gasUsed * 6 / 5)) / c_gasLimitBoundDivisor);
 }
 
 u256 BlockInfo::calculateDifficulty(BlockInfo const& _parent) const
@@ -218,13 +220,11 @@ void BlockInfo::verifyParent(BlockInfo const& _parent) const
 	if (difficulty != calculateDifficulty(_parent))
 		BOOST_THROW_EXCEPTION(InvalidDifficulty() << RequirementError((bigint)calculateDifficulty(_parent), (bigint)difficulty));
 
-	if (gasLimit < _parent.gasLimit * (c_gasLimitBoundDivisor - 1) / c_gasLimitBoundDivisor ||
+	if (gasLimit < c_minGasLimit ||
+		gasLimit < _parent.gasLimit * (c_gasLimitBoundDivisor - 1) / c_gasLimitBoundDivisor ||
 		gasLimit > _parent.gasLimit * (c_gasLimitBoundDivisor + 1) / c_gasLimitBoundDivisor)
 		BOOST_THROW_EXCEPTION(InvalidGasLimit() << errinfo_min((bigint)_parent.gasLimit * (c_gasLimitBoundDivisor - 1) / c_gasLimitBoundDivisor) << errinfo_got((bigint)gasLimit) << errinfo_max((bigint)_parent.gasLimit * (c_gasLimitBoundDivisor + 1) / c_gasLimitBoundDivisor));
 
-	if (seedHash != calculateSeedHash(_parent))
-		BOOST_THROW_EXCEPTION(InvalidSeedHash());
-
 	// Check timestamp is after previous timestamp.
 	if (parentHash)
 	{
diff --git a/libethcore/BlockInfo.h b/libethcore/BlockInfo.h
index 20134f059..8f42dc038 100644
--- a/libethcore/BlockInfo.h
+++ b/libethcore/BlockInfo.h
@@ -67,6 +67,7 @@ enum Strictness
 struct BlockInfo
 {
 public:
+	// TODO: make them all private!
 	h256 hash;						///< SHA3 hash of the block header! Not serialised (the only member not contained in a block header).
 	h256 parentHash;
 	h256 sha3Uncles;
@@ -82,7 +83,6 @@ public:
 	u256 timestamp;
 	bytes extraData;
 	h256 mixHash;
-	h256 seedHash;
 	Nonce nonce;
 
 	BlockInfo();
@@ -113,7 +113,6 @@ public:
 				timestamp == _cmp.timestamp &&
 				extraData == _cmp.extraData &&
 				mixHash == _cmp.mixHash &&
-				seedHash == _cmp.seedHash &&
 				nonce == _cmp.nonce;
 	}
 	bool operator!=(BlockInfo const& _cmp) const { return !operator==(_cmp); }
@@ -128,19 +127,22 @@ public:
 	void populateFromParent(BlockInfo const& parent);
 
 	u256 calculateDifficulty(BlockInfo const& _parent) const;
-	u256 calculateGasLimit(BlockInfo const& _parent) const;
-	h256 calculateSeedHash(BlockInfo const& _parent) const;
+	u256 selectGasLimit(BlockInfo const& _parent) const;
+	h256 const& seedHash() const;
 
 	/// sha3 of the header only.
 	h256 headerHash(IncludeNonce _n) const;
 	void streamRLP(RLPStream& _s, IncludeNonce _n) const;
+
+private:
+	mutable h256 m_seedHash;
 };
 
 inline std::ostream& operator<<(std::ostream& _out, BlockInfo const& _bi)
 {
 	_out << _bi.hash << " " << _bi.parentHash << " " << _bi.sha3Uncles << " " << _bi.coinbaseAddress << " " << _bi.stateRoot << " " << _bi.transactionsRoot << " " <<
 			_bi.receiptsRoot << " " << _bi.logBloom << " " << _bi.difficulty << " " << _bi.number << " " << _bi.gasLimit << " " <<
-			_bi.gasUsed << " " << _bi.timestamp << " " << _bi.mixHash << " " << _bi.seedHash << " " << _bi.nonce;
+			_bi.gasUsed << " " << _bi.timestamp << " " << _bi.mixHash << " " << _bi.nonce << " (" << _bi.seedHash() << ")";
 	return _out;
 }
 
diff --git a/libethcore/Common.cpp b/libethcore/Common.cpp
index 9eb622fe3..76efc06a2 100644
--- a/libethcore/Common.cpp
+++ b/libethcore/Common.cpp
@@ -32,8 +32,8 @@ namespace dev
 namespace eth
 {
 
-const unsigned c_protocolVersion = 56;
-const unsigned c_databaseBaseVersion = 7;
+const unsigned c_protocolVersion = 58;
+const unsigned c_databaseBaseVersion = 8;
 #if ETH_FATDB
 const unsigned c_databaseVersionModifier = 1000;
 #else
diff --git a/libethcore/Ethasher.cpp b/libethcore/Ethasher.cpp
index a28895a1a..f80277cb2 100644
--- a/libethcore/Ethasher.cpp
+++ b/libethcore/Ethasher.cpp
@@ -25,11 +25,12 @@
 #include <array>
 #include <random>
 #include <thread>
+#include <libdevcore/Common.h>
 #include <libdevcore/Guards.h>
 #include <libdevcore/Log.h>
 #include <libdevcrypto/CryptoPP.h>
 #include <libdevcrypto/FileSystem.h>
-#include <libdevcore/Common.h>
+#include <libethcore/Params.h>
 #include <libethash/ethash.h>
 #include "BlockInfo.h"
 #include "Ethasher.h"
@@ -43,46 +44,46 @@ Ethasher* dev::eth::Ethasher::s_this = nullptr;
 bytes const& Ethasher::cache(BlockInfo const& _header)
 {
 	RecursiveGuard l(x_this);
-	if (!m_caches.count(_header.seedHash))
+	if (_header.number > EPOCH_LENGTH*2048) {
+		std::ostringstream error;
+		error << "block number is too high; max is " << EPOCH_LENGTH*2048 << "(was " << _header.number << ")";
+		throw std::invalid_argument( error.str() );
+ 	}
+
+	if (!m_caches.count(_header.seedHash()))
 	{
-		try {
-			boost::filesystem::create_directories(getDataDir() + "/ethashcache");
-		} catch (...) {}
-		std::string memoFile = getDataDir() + "/ethashcache/" + toHex(_header.seedHash.ref().cropped(0, 4)) + ".cache";
-		m_caches[_header.seedHash] = contents(memoFile);
-		if (m_caches[_header.seedHash].empty())
-		{
-			ethash_params p = params((unsigned)_header.number);
-			m_caches[_header.seedHash].resize(p.cache_size);
-			ethash_prep_light(m_caches[_header.seedHash].data(), &p, _header.seedHash.data());
-			writeFile(memoFile, m_caches[_header.seedHash]);
-		}
+		ethash_params p = params((unsigned)_header.number);
+		m_caches[_header.seedHash()].resize(p.cache_size);
+		ethash_prep_light(m_caches[_header.seedHash()].data(), &p, _header.seedHash().data());
 	}
-	return m_caches[_header.seedHash];
+	return m_caches[_header.seedHash()];
 }
 
 bytesConstRef Ethasher::full(BlockInfo const& _header)
 {
 	RecursiveGuard l(x_this);
-	if (!m_fulls.count(_header.seedHash))
+	if (!m_fulls.count(_header.seedHash()))
 	{
 		if (!m_fulls.empty())
 		{
 			delete [] m_fulls.begin()->second.data();
 			m_fulls.erase(m_fulls.begin());
 		}
-		std::string memoFile = getDataDir() + "/ethashcache/" + toHex(_header.seedHash.ref().cropped(0, 4)) + ".full";
-		m_fulls[_header.seedHash] = contentsNew(memoFile);
-		if (!m_fulls[_header.seedHash])
+		try {
+			boost::filesystem::create_directories(getDataDir() + "/ethashcache");
+		} catch (...) {}
+		std::string memoFile = getDataDir() + "/ethashcache/" + toHex(_header.seedHash().ref().cropped(0, 4)) + ".full";
+		m_fulls[_header.seedHash()] = contentsNew(memoFile);
+		if (!m_fulls[_header.seedHash()])
 		{
 			ethash_params p = params((unsigned)_header.number);
-			m_fulls[_header.seedHash] = bytesRef(new byte[p.full_size], p.full_size);
+			m_fulls[_header.seedHash()] = bytesRef(new byte[p.full_size], p.full_size);
 			auto c = cache(_header);
-			ethash_prep_full(m_fulls[_header.seedHash].data(), &p, c.data());
-			writeFile(memoFile, m_fulls[_header.seedHash]);
+			ethash_prep_full(m_fulls[_header.seedHash()].data(), &p, c.data());
+			writeFile(memoFile, m_fulls[_header.seedHash()]);
 		}
 	}
-	return m_fulls[_header.seedHash];
+	return m_fulls[_header.seedHash()];
 }
 
 ethash_params Ethasher::params(BlockInfo const& _header)
@@ -100,7 +101,19 @@ ethash_params Ethasher::params(unsigned _n)
 
 bool Ethasher::verify(BlockInfo const& _header)
 {
-	bigint boundary = (bigint(1) << 256) / _header.difficulty;
+	if (_header.number >= ETHASH_EPOCH_LENGTH * 2048)
+		return false;
+	h256 boundary = u256((bigint(1) << 256) / _header.difficulty);
+	uint8_t quickHashOut[32];
+	ethash_quick_hash(
+		quickHashOut,
+		_header.headerHash(WithoutNonce).data(),
+		(uint64_t)(u64)_header.nonce,
+		_header.mixHash.data()
+	);
+	h256 quickHashOut256 = h256(quickHashOut, h256::ConstructFromPointer);
+	if (quickHashOut256 > boundary)
+		return false;
 	auto e = eval(_header, _header.nonce);
 	return (u256)e.value <= boundary && e.mixHash == _header.mixHash;
 }
@@ -112,4 +125,3 @@ Ethasher::Result Ethasher::eval(BlockInfo const& _header, Nonce const& _nonce)
 	ethash_compute_light(&r, Ethasher::get()->cache(_header).data(), &p, _header.headerHash(WithoutNonce).data(), (uint64_t)(u64)_nonce);
 	return Result{h256(r.result, h256::ConstructFromPointer), h256(r.mix_hash, h256::ConstructFromPointer)};
 }
-
diff --git a/libethcore/Params.cpp b/libethcore/Params.cpp
index d1154abcc..694219013 100644
--- a/libethcore/Params.cpp
+++ b/libethcore/Params.cpp
@@ -31,7 +31,7 @@ namespace eth
 u256 const c_genesisDifficulty = 131072;
 u256 const c_maximumExtraDataSize = 1024;
 u256 const c_epochDuration = 3000;
-u256 const c_genesisGasLimit = 1000000;
+u256 const c_genesisGasLimit = 3141592;
 u256 const c_minGasLimit = 125000;
 u256 const c_gasLimitBoundDivisor = 1024;
 u256 const c_minimumDifficulty = 131072;
diff --git a/libethcore/ProofOfWork.cpp b/libethcore/ProofOfWork.cpp
index d261ccb1c..3cbfb4905 100644
--- a/libethcore/ProofOfWork.cpp
+++ b/libethcore/ProofOfWork.cpp
@@ -30,6 +30,9 @@
 #include <libdevcrypto/CryptoPP.h>
 #include <libdevcrypto/FileSystem.h>
 #include <libdevcore/Common.h>
+#if ETH_ETHASHCL
+#include <libethash-cl/ethash_cl_miner.h>
+#endif
 #include "BlockInfo.h"
 #include "Ethasher.h"
 #include "ProofOfWork.h"
@@ -41,12 +44,12 @@ namespace dev
 namespace eth
 {
 
-bool Ethash::verify(BlockInfo const& _header)
+bool EthashCPU::verify(BlockInfo const& _header)
 {
 	return Ethasher::verify(_header);
 }
 
-std::pair<MineInfo, Ethash::Proof> Ethash::mine(BlockInfo const& _header, unsigned _msTimeout, bool _continue, bool _turbo)
+std::pair<MineInfo, EthashCPU::Proof> EthashCPU::mine(BlockInfo const& _header, unsigned _msTimeout, bool _continue, bool _turbo)
 {
 	Ethasher::Miner m(_header);
 
@@ -93,5 +96,113 @@ std::pair<MineInfo, Ethash::Proof> Ethash::mine(BlockInfo const& _header, unsign
 	return ret;
 }
 
+#if ETH_ETHASHCL
+
+/*
+struct ethash_cl_search_hook
+{
+	// reports progress, return true to abort
+	virtual bool found(uint64_t const* nonces, uint32_t count) = 0;
+	virtual bool searched(uint64_t start_nonce, uint32_t count) = 0;
+};
+
+class ethash_cl_miner
+{
+public:
+	ethash_cl_miner();
+
+	bool init(ethash_params const& params, const uint8_t seed[32], unsigned workgroup_size = 64);
+
+	void hash(uint8_t* ret, uint8_t const* header, uint64_t nonce, unsigned count);
+	void search(uint8_t const* header, uint64_t target, search_hook& hook);
+};
+*/
+
+struct EthashCLHook: public ethash_cl_search_hook
+{
+	virtual bool found(uint64_t const* _nonces, uint32_t _count)
+	{
+		Guard l(x_all);
+		for (unsigned i = 0; i < _count; ++i)
+			found.push_back((Nonce)(u64)_nonces[i]);
+		if (abort)
+		{
+			aborted = true;
+			return true;
+		}
+		return false;
+	}
+
+	virtual bool searched(uint64_t _startNonce, uint32_t _count)
+	{
+		Guard l(x_all);
+		total += _count;
+		last = _startNonce + _count;
+		if (abort)
+		{
+			aborted = true;
+			return true;
+		}
+		return false;
+	}
+
+	vector<Nonce> fetchFound() { vector<Nonce> ret; Guard l(x_all); std::swap(ret, found); return ret; }
+	uint64_t fetchTotal() { Guard l(x_all); auto ret = total; total = 0; return ret; }
+
+	Mutex x_all;
+	vector<Nonce> found;
+	uint64_t total;
+	uint64_t last;
+	bool abort = false;
+	bool aborted = false;
+};
+
+EthashCL::EthashCL():
+	m_miner(new ethash_cl_miner),
+	m_hook(new EthashCLHook)
+{
+}
+
+EthashCL::~EthashCL()
+{
+	m_hook->abort = true;
+	for (unsigned timeout = 0; timeout < 100 && !m_hook->aborted; ++timeout)
+		std::this_thread::sleep_for(chrono::milliseconds(30));
+	if (!m_hook->aborted)
+		cwarn << "Couldn't abort. Abandoning OpenCL process.";
+}
+
+bool EthashCL::verify(BlockInfo const& _header)
+{
+	return Ethasher::verify(_header);
+}
+
+std::pair<MineInfo, Ethash::Proof> EthashCL::mine(BlockInfo const& _header, unsigned _msTimeout, bool, bool)
+{
+	if (m_lastHeader.seedHash() != _header.seedHash())
+	{
+		m_miner->init(Ethasher::params(_header), _header.seedHash().data());
+		// TODO: reinit probably won't work when seed changes.
+	}
+	if (m_lastHeader != _header)
+	{
+		static std::random_device s_eng;
+		uint64_t tryNonce = (uint64_t)(u64)(m_last = Nonce::random(s_eng));
+		m_miner->search(_header.headerHash(WithoutNonce).data(), tryNonce, *m_hook);
+	}
+	m_lastHeader = _header;
+
+	std::this_thread::sleep_for(chrono::milliseconds(_msTimeout));
+	auto found = m_hook->fetchFound();
+	if (!found.empty())
+	{
+		h256 mixHash; // ?????
+		return std::make_pair(MineInfo{0.0, 1e99, 0, true}, EthashCL::Proof((Nonce)(u64)found[0], mixHash));
+	}
+	return std::make_pair(MineInfo{0.0, 1e99, 0, false}, EthashCL::Proof());
+}
+
+#endif
+
 }
 }
diff --git a/libethcore/ProofOfWork.h b/libethcore/ProofOfWork.h
index 250ddb73d..245a96a02 100644
--- a/libethcore/ProofOfWork.h
+++ b/libethcore/ProofOfWork.h
@@ -32,6 +32,9 @@
 
 #define FAKE_DAGGER 1
 
+class ethash_cl_miner;
+struct ethash_cl_search_hook;
+
 namespace dev
 {
 namespace eth
@@ -46,7 +49,7 @@ struct MineInfo
 	bool completed = false;
 };
 
-class Ethash
+class EthashCPU
 {
 public:
 	struct Proof
@@ -63,6 +66,36 @@ protected:
 	Nonce m_last;
 };
 
+#if ETH_ETHASHCL
+class EthashCL
+{
+public:
+	struct Proof
+	{
+		Nonce nonce;
+		h256 mixHash;
+	};
+
+	EthashCL();
+	~EthashCL();
+
+	static bool verify(BlockInfo const& _header);
+	std::pair<MineInfo, Proof> mine(BlockInfo const& _header, unsigned _msTimeout = 100, bool _continue = true, bool _turbo = false);
+	static void assignResult(Proof const& _r, BlockInfo& _header) { _header.nonce = _r.nonce; _header.mixHash = _r.mixHash; }
+
+protected:
+	Nonce m_last;
+	BlockInfo m_lastHeader;
+	Nonce m_mined;
+	std::unique_ptr<ethash_cl_miner> m_miner;
+	std::unique_ptr<ethash_cl_search_hook> m_hook;
+};
+
+using Ethash = EthashCL;
+#else
+using Ethash = EthashCPU;
+#endif
+
 template <class Evaluator>
 class ProofOfWorkEngine: public Evaluator
 {
diff --git a/libethereum/BlockChain.cpp b/libethereum/BlockChain.cpp
index dd0bfad67..19a16d193 100644
--- a/libethereum/BlockChain.cpp
+++ b/libethereum/BlockChain.cpp
@@ -65,13 +65,13 @@ std::ostream& dev::eth::operator<<(std::ostream& _out, BlockChain const& _bc)
 ldb::Slice dev::eth::toSlice(h256 _h, unsigned _sub)
 {
 #if ALL_COMPILERS_ARE_CPP11_COMPLIANT
-	static thread_local h256 h = _h ^ h256(u256(_sub));
+	static thread_local h256 h = _h ^ sha3(h256(u256(_sub)));
 	return ldb::Slice((char const*)&h, 32);
 #else
 	static boost::thread_specific_ptr<h256> t_h;
 	if (!t_h.get())
 		t_h.reset(new h256);
-	*t_h = _h ^ h256(u256(_sub));
+	*t_h = _h ^ sha3(h256(u256(_sub)));
 	return ldb::Slice((char const*)t_h.get(), 32);
 #endif
 }
@@ -140,7 +140,7 @@ void BlockChain::open(std::string _path, bool _killExisting)
 		// Insert details of genesis block.
 		m_details[m_genesisHash] = BlockDetails(0, c_genesisDifficulty, h256(), {});
 		auto r = m_details[m_genesisHash].rlp();
-		m_extrasDB->Put(m_writeOptions, ldb::Slice((char const*)&m_genesisHash, 32), (ldb::Slice)dev::ref(r));
+		m_extrasDB->Put(m_writeOptions, toSlice(m_genesisHash, ExtraDetails), (ldb::Slice)dev::ref(r));
 	}
 
 	checkConsistency();
@@ -324,8 +324,22 @@ h256s BlockChain::import(bytes const& _block, OverlayDB const& _db)
 			WriteGuard l(x_blockHashes);
 			m_blockHashes[h256(bi.number)].value = newHash;
 		}
+		h256s alteredBlooms;
+		{
+			WriteGuard l(x_blocksBlooms);
+			LogBloom blockBloom = bi.logBloom;
+			blockBloom.shiftBloom<3>(sha3(bi.coinbaseAddress.ref()));
+			unsigned index = (unsigned)bi.number;
+			for (unsigned level = 0; level < c_bloomIndexLevels; level++, index /= c_bloomIndexSize)
+			{
+				unsigned i = index / c_bloomIndexSize;
+				unsigned o = index % c_bloomIndexSize;
+				alteredBlooms.push_back(chunkId(level, i));
+				m_blocksBlooms[alteredBlooms.back()].blooms[o] |= blockBloom;
+			}
+		}
 		// Collate transaction hashes and remember who they were.
-		h256s tas;
+		h256s newTransactionAddresses;
 		{
 			RLP blockRLP(_block);
 			TransactionAddress ta;
@@ -333,8 +347,8 @@ h256s BlockChain::import(bytes const& _block, OverlayDB const& _db)
 			WriteGuard l(x_transactionAddresses);
 			for (ta.index = 0; ta.index < blockRLP[1].itemCount(); ++ta.index)
 			{
-				tas.push_back(sha3(blockRLP[1][ta.index].data()));
-				m_transactionAddresses[tas.back()] = ta;
+				newTransactionAddresses.push_back(sha3(blockRLP[1][ta.index].data()));
+				m_transactionAddresses[newTransactionAddresses.back()] = ta;
 			}
 		}
 		{
@@ -346,14 +360,24 @@ h256s BlockChain::import(bytes const& _block, OverlayDB const& _db)
 			m_receipts[newHash] = br;
 		}
 
-		m_blocksDB->Put(m_writeOptions, toSlice(newHash), (ldb::Slice)ref(_block));
-		m_extrasDB->Put(m_writeOptions, toSlice(newHash, ExtraDetails), (ldb::Slice)dev::ref(m_details[newHash].rlp()));
-		m_extrasDB->Put(m_writeOptions, toSlice(bi.parentHash, ExtraDetails), (ldb::Slice)dev::ref(m_details[bi.parentHash].rlp()));
-		m_extrasDB->Put(m_writeOptions, toSlice(h256(bi.number), ExtraBlockHash), (ldb::Slice)dev::ref(m_blockHashes[h256(bi.number)].rlp()));
-		for (auto const& h: tas)
-			m_extrasDB->Put(m_writeOptions, toSlice(h, ExtraTransactionAddress), (ldb::Slice)dev::ref(m_transactionAddresses[h].rlp()));
-		m_extrasDB->Put(m_writeOptions, toSlice(newHash, ExtraLogBlooms), (ldb::Slice)dev::ref(m_logBlooms[newHash].rlp()));
-		m_extrasDB->Put(m_writeOptions, toSlice(newHash, ExtraReceipts), (ldb::Slice)dev::ref(m_receipts[newHash].rlp()));
+		{
+			ReadGuard l1(x_blocksBlooms);
+			ReadGuard l2(x_details);
+			ReadGuard l3(x_blockHashes);
+			ReadGuard l4(x_receipts);
+			ReadGuard l5(x_logBlooms);
+			ReadGuard l6(x_transactionAddresses);
+			m_blocksDB->Put(m_writeOptions, toSlice(newHash), (ldb::Slice)ref(_block));
+			m_extrasDB->Put(m_writeOptions, toSlice(newHash, ExtraDetails), (ldb::Slice)dev::ref(m_details[newHash].rlp()));
+			m_extrasDB->Put(m_writeOptions, toSlice(bi.parentHash, ExtraDetails), (ldb::Slice)dev::ref(m_details[bi.parentHash].rlp()));
+			m_extrasDB->Put(m_writeOptions, toSlice(h256(bi.number), ExtraBlockHash), (ldb::Slice)dev::ref(m_blockHashes[h256(bi.number)].rlp()));
+			for (auto const& h: newTransactionAddresses)
+				m_extrasDB->Put(m_writeOptions, toSlice(h, ExtraTransactionAddress), (ldb::Slice)dev::ref(m_transactionAddresses[h].rlp()));
+			m_extrasDB->Put(m_writeOptions, toSlice(newHash, ExtraLogBlooms), (ldb::Slice)dev::ref(m_logBlooms[newHash].rlp()));
+			m_extrasDB->Put(m_writeOptions, toSlice(newHash, ExtraReceipts), (ldb::Slice)dev::ref(m_receipts[newHash].rlp()));
+			for (auto const& h: alteredBlooms)
+				m_extrasDB->Put(m_writeOptions, toSlice(h, ExtraBlocksBlooms), (ldb::Slice)dev::ref(m_blocksBlooms[h].rlp()));
+		}
 
 #if ETH_PARANOIA
 		checkConsistency();
@@ -475,29 +499,30 @@ template <class T> static unsigned getHashSize(map<h256, T> const& _map)
 void BlockChain::updateStats() const
 {
 	{
-		ReadGuard l1(x_blocks);
+		ReadGuard l(x_blocks);
 		m_lastStats.memBlocks = 0;
 		for (auto const& i: m_blocks)
 			m_lastStats.memBlocks += i.second.size() + 64;
 	}
 	{
-		ReadGuard l2(x_details);
+		ReadGuard l(x_details);
 		m_lastStats.memDetails = getHashSize(m_details);
 	}
 	{
-		ReadGuard l5(x_logBlooms);
-		m_lastStats.memLogBlooms = getHashSize(m_logBlooms);
+		ReadGuard l1(x_logBlooms);
+		ReadGuard l2(x_blocksBlooms);
+		m_lastStats.memLogBlooms = getHashSize(m_logBlooms) + getHashSize(m_blocksBlooms);
 	}
 	{
-		ReadGuard l4(x_receipts);
+		ReadGuard l(x_receipts);
 		m_lastStats.memReceipts = getHashSize(m_receipts);
 	}
 	{
-		ReadGuard l3(x_blockHashes);
+		ReadGuard l(x_blockHashes);
 		m_lastStats.memBlockHashes = getHashSize(m_blockHashes);
 	}
 	{
-		ReadGuard l6(x_transactionAddresses);
+		ReadGuard l(x_transactionAddresses);
 		m_lastStats.memTransactionAddresses = getHashSize(m_transactionAddresses);
 	}
 }
@@ -520,6 +545,7 @@ void BlockChain::garbageCollect(bool _force)
 	WriteGuard l4(x_receipts);
 	WriteGuard l5(x_logBlooms);
 	WriteGuard l6(x_transactionAddresses);
+	WriteGuard l7(x_blocksBlooms);
 	for (CacheID const& id: m_cacheUsage.back())
 	{
 		m_inUse.erase(id);
@@ -544,6 +570,9 @@ void BlockChain::garbageCollect(bool _force)
 		case ExtraTransactionAddress:
 			m_transactionAddresses.erase(id.first);
 			break;
+		case ExtraBlocksBlooms:
+			m_blocksBlooms.erase(id.first);
+			break;
 		}
 	}
 	m_cacheUsage.pop_back();
@@ -579,6 +608,76 @@ void BlockChain::checkConsistency()
 	delete it;
 }
 
+static inline unsigned upow(unsigned a, unsigned b) { while (b-- > 0) a *= a; return a; }
+static inline unsigned ceilDiv(unsigned n, unsigned d) { return n / (n + d - 1); }
+static inline unsigned floorDivPow(unsigned n, unsigned a, unsigned b) { return n / upow(a, b); }
+static inline unsigned ceilDivPow(unsigned n, unsigned a, unsigned b) { return ceilDiv(n, upow(a, b)); }
+
+// Level 1
+// [xxx.            ]
+
+// Level 0
+// [.x............F.]
+// [........x.......]
+// [T.............x.]
+// [............    ]
+
+// F = 14. T = 32
+
+vector<unsigned> BlockChain::withBlockBloom(LogBloom const& _b, unsigned _earliest, unsigned _latest) const
+{
+	vector<unsigned> ret;
+
+	// start from the top-level
+	unsigned u = upow(c_bloomIndexSize, c_bloomIndexLevels);
+
+	// run through each of the top-level blockbloom blocks
+	for (unsigned index = _earliest / u; index <= ceilDiv(_latest, u); ++index)				// 0
+		ret += withBlockBloom(_b, _earliest, _latest, c_bloomIndexLevels - 1, index);
+
+	return ret;
+}
+
+vector<unsigned> BlockChain::withBlockBloom(LogBloom const& _b, unsigned _earliest, unsigned _latest, unsigned _level, unsigned _index) const
+{
+	// 14, 32, 1, 0
+		// 14, 32, 0, 0
+		// 14, 32, 0, 1
+		// 14, 32, 0, 2
+
+	vector<unsigned> ret;
+
+	unsigned uCourse = upow(c_bloomIndexSize, _level + 1);
+	// 256
+		// 16
+	unsigned uFine = upow(c_bloomIndexSize, _level);
+	// 16
+		// 1
+
+	unsigned obegin = _index == _earliest / uCourse ? _earliest / uFine % c_bloomIndexSize : 0;
+	// 0
+		// 14
+		// 0
+		// 0
+	unsigned oend = _index == _latest / uCourse ? (_latest / uFine) % c_bloomIndexSize + 1 : c_bloomIndexSize;
+	// 3
+		// 16
+		// 16
+		// 1
+
+	BlocksBlooms bb = blocksBlooms(_level, _index);
+	for (unsigned o = obegin; o < oend; ++o)
+		if (bb.blooms[o].contains(_b))
+		{
+			// This level has something like what we want.
+			if (_level > 0)
+				ret += withBlockBloom(_b, _earliest, _latest, _level - 1, o + _index * c_bloomIndexSize);
+			else
+				ret.push_back(o + _index * c_bloomIndexSize);
+		}
+	return ret;
+}
+
 h256Set BlockChain::allUnclesFrom(h256 _parent) const
 {
 	// Get all uncles cited given a parent (i.e. featured as uncles/main in parent, parent + 1, ... parent + 5).
@@ -604,7 +703,7 @@ bool BlockChain::isKnown(h256 _hash) const
 			return true;
 	}
 	string d;
-	m_blocksDB->Get(m_readOptions, ldb::Slice((char const*)&_hash, 32), &d);
+	m_blocksDB->Get(m_readOptions, toSlice(_hash), &d);
 	return !!d.size();
 }
 
@@ -621,7 +720,7 @@ bytes BlockChain::block(h256 _hash) const
 	}
 
 	string d;
-	m_blocksDB->Get(m_readOptions, ldb::Slice((char const*)&_hash, 32), &d);
+	m_blocksDB->Get(m_readOptions, toSlice(_hash), &d);
 
 	if (!d.size())
 	{
diff --git a/libethereum/BlockChain.h b/libethereum/BlockChain.h
index 0c1a81066..9676b4a78 100644
--- a/libethereum/BlockChain.h
+++ b/libethereum/BlockChain.h
@@ -71,7 +71,8 @@ enum {
 	ExtraBlockHash,
 	ExtraTransactionAddress,
 	ExtraLogBlooms,
-	ExtraReceipts
+	ExtraReceipts,
+	ExtraBlocksBlooms
 };
 
 /**
@@ -132,8 +133,29 @@ public:
 	/// Get a list of transaction hashes for a given block. Thread-safe.
 	h256 numberHash(u256 _index) const { if (!_index) return genesisHash(); return queryExtras<BlockHash, ExtraBlockHash>(h256(_index), m_blockHashes, x_blockHashes, NullBlockHash).value; }
 
+	/** Get the block blooms for a number of blocks. Thread-safe.
+	 * @returns the object pertaining to the blocks:
+	 * level 0:
+	 * 0x, 0x + 1, .. (1x - 1)
+	 * 1x, 1x + 1, .. (2x - 1)
+	 * ...
+	 * (255x .. (256x - 1))
+	 * level 1:
+	 * 0x .. (1x - 1), 1x .. (2x - 1), ..., (255x .. (256x - 1))
+	 * 256x .. (257x - 1), 257x .. (258x - 1), ..., (511x .. (512x - 1))
+	 * ...
+	 * level n, index i, offset o:
+	 * i * (x ^ n) + o * x ^ (n - 1)
+	 */
+	BlocksBlooms blocksBlooms(unsigned _level, unsigned _index) const { return blocksBlooms(chunkId(_level, _index)); }
+	BlocksBlooms blocksBlooms(h256 const& _chunkId) const { return queryExtras<BlocksBlooms, ExtraBlocksBlooms>(_chunkId, m_blocksBlooms, x_blocksBlooms, NullBlocksBlooms); }
+	LogBloom blockBloom(unsigned _number) const { return blocksBlooms(chunkId(0, _number / c_bloomIndexSize)).blooms[_number % c_bloomIndexSize]; }
+	std::vector<unsigned> withBlockBloom(LogBloom const& _b, unsigned _earliest, unsigned _latest) const;
+	std::vector<unsigned> withBlockBloom(LogBloom const& _b, unsigned _earliest, unsigned _latest, unsigned _topLevel, unsigned _index) const;
+
 	/// Get a transaction from its hash. Thread-safe.
 	bytes transaction(h256 _transactionHash) const { TransactionAddress ta = queryExtras<TransactionAddress, ExtraTransactionAddress>(_transactionHash, m_transactionAddresses, x_transactionAddresses, NullTransactionAddress); if (!ta) return bytes(); return transaction(ta.blockHash, ta.index); }
+	std::pair<h256, unsigned> transactionLocation(h256 _transactionHash) const { TransactionAddress ta = queryExtras<TransactionAddress, ExtraTransactionAddress>(_transactionHash, m_transactionAddresses, x_transactionAddresses, NullTransactionAddress); if (!ta) return std::pair<h256, unsigned>(h256(), 0); return std::make_pair(ta.blockHash, ta.index); }
 
 	/// Get a block's transaction (RLP format) for the given block hash (or the most recent mined if none given) & index. Thread-safe.
 	bytes transaction(h256 _blockHash, unsigned _i) const { bytes b = block(_blockHash); return RLP(b)[1][_i].data().toBytes(); }
@@ -188,6 +210,8 @@ public:
 	void garbageCollect(bool _force = false);
 
 private:
+	static h256 chunkId(unsigned _level, unsigned _index) { return h256(_index * 0xff + _level); }
+
 	void open(std::string _path, bool _killExisting = false);
 	void close();
 
@@ -230,6 +254,8 @@ private:
 	mutable TransactionAddressHash m_transactionAddresses;
 	mutable SharedMutex x_blockHashes;
 	mutable BlockHashHash m_blockHashes;
+	mutable SharedMutex x_blocksBlooms;
+	mutable BlocksBloomsHash m_blocksBlooms;
 
 	using CacheID = std::pair<h256, unsigned>;
 	mutable Mutex x_cacheUsage;
diff --git a/libethereum/BlockDetails.h b/libethereum/BlockDetails.h
index ed478568d..572ed1888 100644
--- a/libethereum/BlockDetails.h
+++ b/libethereum/BlockDetails.h
@@ -36,6 +36,11 @@ namespace dev
 namespace eth
 {
 
+// TODO: OPTIMISE: constructors take bytes, RLP used only in necessary classes.
+
+static const unsigned c_bloomIndexSize = 16;
+static const unsigned c_bloomIndexLevels = 2;
+
 struct BlockDetails
 {
 	BlockDetails(): number(0), totalDifficulty(0) {}
@@ -64,6 +69,16 @@ struct BlockLogBlooms
 	mutable unsigned size;
 };
 
+struct BlocksBlooms
+{
+	BlocksBlooms() {}
+	BlocksBlooms(RLP const& _r) { blooms = _r.toArray<LogBloom, c_bloomIndexSize>(); size = _r.data().size(); }
+	bytes rlp() const { RLPStream s; s << blooms; size = s.out().size(); return s.out(); }
+
+	std::array<LogBloom, c_bloomIndexSize> blooms;
+	mutable unsigned size;
+};
+
 struct BlockReceipts
 {
 	BlockReceipts() {}
@@ -103,12 +118,14 @@ using BlockLogBloomsHash = std::map<h256, BlockLogBlooms>;
 using BlockReceiptsHash = std::map<h256, BlockReceipts>;
 using TransactionAddressHash = std::map<h256, TransactionAddress>;
 using BlockHashHash = std::map<h256, BlockHash>;
+using BlocksBloomsHash = std::map<h256, BlocksBlooms>;
 
 static const BlockDetails NullBlockDetails;
 static const BlockLogBlooms NullBlockLogBlooms;
 static const BlockReceipts NullBlockReceipts;
 static const TransactionAddress NullTransactionAddress;
 static const BlockHash NullBlockHash;
+static const BlocksBlooms NullBlocksBlooms;
 
 }
 }
diff --git a/libethereum/CMakeLists.txt b/libethereum/CMakeLists.txt
index 94a4e4497..3df3b9bc3 100644
--- a/libethereum/CMakeLists.txt
+++ b/libethereum/CMakeLists.txt
@@ -36,6 +36,10 @@ target_link_libraries(${EXECUTABLE} devcrypto)
 target_link_libraries(${EXECUTABLE} ethcore)
 target_link_libraries(${EXECUTABLE} secp256k1)
 
+if (ETHASHCL)
+	target_link_libraries(${EXECUTABLE} ethash-cl)
+endif ()
+
 if (CMAKE_COMPILER_IS_MINGW)
 	target_link_libraries(${EXECUTABLE} ssp shlwapi)
 endif()
diff --git a/libethereum/CanonBlockChain.cpp b/libethereum/CanonBlockChain.cpp
index 569bddca1..21b30d8ef 100644
--- a/libethereum/CanonBlockChain.cpp
+++ b/libethereum/CanonBlockChain.cpp
@@ -85,8 +85,8 @@ bytes CanonBlockChain::createGenesisBlock()
 		stateRoot = state.root();
 	}
 
-	block.appendList(16)
-			<< h256() << EmptyListSHA3 << h160() << stateRoot << EmptyTrie << EmptyTrie << LogBloom() << c_genesisDifficulty << 0 << 1000000 << 0 << (unsigned)0 << string() << h256() << h256() << Nonce(u64(42));
+	block.appendList(15)
+			<< h256() << EmptyListSHA3 << h160() << stateRoot << EmptyTrie << EmptyTrie << LogBloom() << c_genesisDifficulty << 0 << c_genesisGasLimit << 0 << (unsigned)0 << string() << h256() << Nonce(u64(42));
 	block.appendRaw(RLPEmptyList);
 	block.appendRaw(RLPEmptyList);
 	return block.out();
diff --git a/libethereum/Client.cpp b/libethereum/Client.cpp
index b6c310d34..9d7ecb605 100644
--- a/libethereum/Client.cpp
+++ b/libethereum/Client.cpp
@@ -249,13 +249,13 @@ void Client::clearPending()
 	noteChanged(changeds);
 }
 
-unsigned Client::installWatch(h256 _h)
+unsigned Client::installWatch(h256 _h, Reaping _r)
 {
 	unsigned ret;
 	{
 		Guard l(m_filterLock);
 		ret = m_watches.size() ? m_watches.rbegin()->first + 1 : 0;
-		m_watches[ret] = ClientWatch(_h);
+		m_watches[ret] = ClientWatch(_h, _r);
 		cwatch << "+++" << ret << _h.abridged();
 	}
 	auto ch = logs(ret);
@@ -268,7 +268,7 @@ unsigned Client::installWatch(h256 _h)
 	return ret;
 }
 
-unsigned Client::installWatch(LogFilter const& _f)
+unsigned Client::installWatch(LogFilter const& _f, Reaping _r)
 {
 	h256 h = _f.sha3();
 	{
@@ -279,10 +279,10 @@ unsigned Client::installWatch(LogFilter const& _f)
 			m_filters.insert(make_pair(h, _f));
 		}
 	}
-	return installWatch(h);
+	return installWatch(h, _r);
 }
 
-void Client::uninstallWatch(unsigned _i)
+bool Client::uninstallWatch(unsigned _i)
 {
 	cwatch << "XXX" << _i;
 
@@ -290,7 +290,7 @@ void Client::uninstallWatch(unsigned _i)
 
 	auto it = m_watches.find(_i);
 	if (it == m_watches.end())
-		return;
+		return false;
 	auto id = it->second.id;
 	m_watches.erase(it);
 
@@ -301,6 +301,7 @@ void Client::uninstallWatch(unsigned _i)
 			cwatch << "*X*" << fit->first << ":" << fit->second.filter;
 			m_filters.erase(fit);
 		}
+	return true;
 }
 
 void Client::noteChanged(h256Set const& _filters)
@@ -327,19 +328,15 @@ LocalisedLogEntries Client::peekWatch(unsigned _watchId) const
 {
 	Guard l(m_filterLock);
 
-	try {
 #if ETH_DEBUG
-		cdebug << "peekWatch" << _watchId;
+	cdebug << "peekWatch" << _watchId;
 #endif
-		auto& w = m_watches.at(_watchId);
+	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();
+	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 (...) {}
-
-	return LocalisedLogEntries();
+	w.lastPoll = chrono::system_clock::now();
+	return w.changes;
 }
 
 LocalisedLogEntries Client::checkWatch(unsigned _watchId)
@@ -347,17 +344,15 @@ LocalisedLogEntries Client::checkWatch(unsigned _watchId)
 	Guard l(m_filterLock);
 	LocalisedLogEntries ret;
 
-	try {
 #if ETH_DEBUG && 0
-		cdebug << "checkWatch" << _watchId;
+	cdebug << "checkWatch" << _watchId;
 #endif
-		auto& w = m_watches.at(_watchId);
+	auto& w = m_watches.at(_watchId);
 #if ETH_DEBUG && 0
-		cdebug << "lastPoll updated to " << chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
+	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 (...) {}
+	std::swap(ret, w.changes);
+	w.lastPoll = chrono::system_clock::now();
 
 	return ret;
 }
@@ -416,8 +411,11 @@ void Client::setForceMining(bool _enable)
 void Client::setMiningThreads(unsigned _threads)
 {
 	stopMining();
-
+#if ETH_ETHASHCL
+	unsigned t = 1;
+#else
 	auto t = _threads ? _threads : thread::hardware_concurrency();
+#endif
 	WriteGuard l(x_localMiners);
 	m_localMiners.clear();
 	m_localMiners.resize(t);
@@ -493,7 +491,7 @@ void Client::transact(Secret _secret, u256 _value, Address _dest, bytes const& _
 	m_tq.attemptImport(t.rlp());
 }
 
-bytes Client::call(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice)
+bytes Client::call(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, int _blockNumber)
 {
 	bytes out;
 	try
@@ -503,7 +501,7 @@ bytes Client::call(Secret _secret, u256 _value, Address _dest, bytes const& _dat
 	//	cdebug << "Nonce at " << toAddress(_secret) << " pre:" << m_preMine.transactionsFrom(toAddress(_secret)) << " post:" << m_postMine.transactionsFrom(toAddress(_secret));
 		{
 			ReadGuard l(x_stateDB);
-			temp = m_postMine;
+			temp = asOf(_blockNumber);
 			n = temp.transactionsFrom(toAddress(_secret));
 		}
 		Transaction t(_value, _gasPrice, _gas, _dest, _data, n, _secret);
@@ -694,7 +692,7 @@ void Client::doWork()
 		{
 			Guard l(m_filterLock);
 			for (auto key: keysOf(m_watches))
-				if (chrono::system_clock::now() - m_watches[key].lastPoll > chrono::seconds(20))
+				if (m_watches[key].lastPoll != chrono::system_clock::time_point::max() && chrono::system_clock::now() - m_watches[key].lastPoll > chrono::seconds(20))
 				{
 					toUninstall.push_back(key);
 					cnote << "GC: Uninstall" << key << "(" << chrono::duration_cast<chrono::seconds>(chrono::system_clock::now() - m_watches[key].lastPoll).count() << "s old)";
@@ -794,6 +792,11 @@ bytes Client::codeAt(Address _a, int _block) const
 	return asOf(_block).code(_a);
 }
 
+Transaction Client::transaction(h256 _transactionHash) const
+{
+	return Transaction(m_bc.transaction(_transactionHash), CheckSignature::Range);
+}
+
 Transaction Client::transaction(h256 _blockHash, unsigned _i) const
 {
 	auto bl = m_bc.block(_blockHash);
@@ -828,13 +831,41 @@ unsigned Client::uncleCount(h256 _blockHash) const
 	return b[2].itemCount();
 }
 
+Transactions Client::transactions(h256 _blockHash) const
+{
+	auto bl = m_bc.block(_blockHash);
+	RLP b(bl);
+	Transactions res;
+	for (unsigned i = 0; i < b[1].itemCount(); i++)
+		res.emplace_back(b[1][i].data(), CheckSignature::Range);
+	return res;
+}
+
+TransactionHashes Client::transactionHashes(h256 _blockHash) const
+{
+	return m_bc.transactionHashes(_blockHash);
+}
+
+LocalisedLogEntries Client::logs(unsigned _watchId) const
+{
+	LogFilter f;
+	try
+	{
+		Guard l(m_filterLock);
+		f = m_filters.at(m_watches.at(_watchId).id).filter;
+	}
+	catch (...)
+	{
+		return LocalisedLogEntries();
+	}
+	return logs(f);
+}
+
 LocalisedLogEntries Client::logs(LogFilter const& _f) const
 {
 	LocalisedLogEntries ret;
 	unsigned begin = min<unsigned>(m_bc.number() + 1, (unsigned)_f.latest());
 	unsigned end = min(m_bc.number(), min(begin, (unsigned)_f.earliest()));
-	unsigned m = _f.max();
-	unsigned s = _f.skip();
 
 	// Handle pending transactions differently as they're not on the block chain.
 	if (begin > m_bc.number())
@@ -847,68 +878,52 @@ LocalisedLogEntries Client::logs(LogFilter const& _f) const
 			auto sha3 = m_postMine.pending()[i].sha3();
 			LogEntries le = _f.matches(tr);
 			if (le.size())
-			{
-				for (unsigned j = 0; j < le.size() && ret.size() != m; ++j)
-					if (s)
-						s--;
-					else
-						ret.insert(ret.begin(), LocalisedLogEntry(le[j], begin, sha3));
-			}
+				for (unsigned j = 0; j < le.size(); ++j)
+					ret.insert(ret.begin(), LocalisedLogEntry(le[j], begin, sha3));
 		}
 		begin = m_bc.number();
 	}
 
+	set<unsigned> matchingBlocks;
+	for (auto const& i: _f.bloomPossibilities())
+		for (auto u: m_bc.withBlockBloom(i, end, begin))
+			matchingBlocks.insert(u);
+
 #if ETH_DEBUG
-	// fill these params
-	unsigned skipped = 0;
 	unsigned falsePos = 0;
 #endif
-	auto h = m_bc.numberHash(begin);
-	unsigned n = begin;
-	for (; ret.size() != m && n != end; n--, h = m_bc.details(h).parent)
+	for (auto n: matchingBlocks)
 	{
 #if ETH_DEBUG
 		int total = 0;
 #endif
-		// check block bloom
-		auto info = m_bc.info(h);
+		auto h = m_bc.numberHash(n);
 		auto receipts = m_bc.receipts(h).receipts;
-		if (_f.matches(info.logBloom))
-			for (size_t i = 0; i < receipts.size(); i++)
+		for (size_t i = 0; i < receipts.size(); i++)
+		{
+			TransactionReceipt receipt = receipts[i];
+			if (_f.matches(receipt.bloom()))
 			{
-				TransactionReceipt receipt = receipts[i];
-				if (_f.matches(receipt.bloom()))
+				auto info = m_bc.info(h);
+				auto h = transaction(info.hash, i).sha3();
+				LogEntries le = _f.matches(receipt);
+				if (le.size())
 				{
-					auto h = transaction(info.hash, i).sha3();
-					LogEntries le = _f.matches(receipt);
-					if (le.size())
-					{
 #if ETH_DEBUG
-						total += le.size();
+					total += le.size();
 #endif
-						for (unsigned j = 0; j < le.size() && ret.size() != m; ++j)
-						{
-							if (s)
-								s--;
-							else
-								ret.insert(ret.begin(), LocalisedLogEntry(le[j], n, h));
-						}
-					}
+					for (unsigned j = 0; j < le.size(); ++j)
+						ret.insert(ret.begin(), LocalisedLogEntry(le[j], n, h));
 				}
-#if ETH_DEBUG
-				if (!total)
-					falsePos++;
-#endif
 			}
 #if ETH_DEBUG
-		else
-			skipped++;
+			if (!total)
+				falsePos++;
 #endif
-		if (n == end)
-			break;
+		}
 	}
 #if ETH_DEBUG
-	cdebug << (begin - n) << "searched; " << skipped << "skipped; " << falsePos << "false +ves";
+	cdebug << matchingBlocks.size() << "searched from" << (end - begin) << "skipped; " << falsePos << "false +ves";
 #endif
 	return ret;
 }
diff --git a/libethereum/Client.h b/libethereum/Client.h
index 9cbfd7989..02d8ef6f8 100644
--- a/libethereum/Client.h
+++ b/libethereum/Client.h
@@ -46,7 +46,6 @@
 
 namespace dev
 {
-
 namespace eth
 {
 
@@ -93,7 +92,7 @@ static const LocalisedLogEntry InitialChange(SpecialLogEntry, 0);
 struct ClientWatch
 {
 	ClientWatch(): lastPoll(std::chrono::system_clock::now()) {}
-	explicit ClientWatch(h256 _id): id(_id), lastPoll(std::chrono::system_clock::now()) {}
+	explicit ClientWatch(h256 _id, Reaping _r): id(_id), lastPoll(_r == Reaping::Automatic ? std::chrono::system_clock::now() : std::chrono::system_clock::time_point::max()) {}
 
 	h256 id;
 	LocalisedLogEntries changes = LocalisedLogEntries{ InitialChange };
@@ -226,7 +225,7 @@ public:
 	virtual void flushTransactions();
 
 	/// Makes the given call. Nothing is recorded into the state.
-	virtual bytes call(Secret _secret, u256 _value, Address _dest, bytes const& _data = bytes(), u256 _gas = 10000, u256 _gasPrice = 10 * szabo);
+	virtual bytes call(Secret _secret, u256 _value, Address _dest, bytes const& _data = bytes(), u256 _gas = 10000, u256 _gasPrice = 10 * szabo, int _blockNumber = 0);
 
 	/// Makes the given call. Nothing is recorded into the state. This cheats by creating a null address and endowing it with a lot of ETH.
 	virtual bytes call(Address _dest, bytes const& _data = bytes(), u256 _gas = 125000, u256 _value = 0, u256 _gasPrice = 1 * ether);
@@ -247,13 +246,13 @@ public:
 	virtual bytes codeAt(Address _a, int _block) const;
 	virtual std::map<u256, u256> storageAt(Address _a, int _block) const;
 
-	virtual unsigned installWatch(LogFilter const& _filter);
-	virtual unsigned installWatch(h256 _filterId);
-	virtual void uninstallWatch(unsigned _watchId);
+	virtual unsigned installWatch(LogFilter const& _filter, Reaping _r = Reaping::Automatic) override;
+	virtual unsigned installWatch(h256 _filterId, Reaping _r = Reaping::Automatic) override;
+	virtual bool uninstallWatch(unsigned _watchId) override;
 	virtual LocalisedLogEntries peekWatch(unsigned _watchId) const;
 	virtual LocalisedLogEntries checkWatch(unsigned _watchId);
 
-	virtual LocalisedLogEntries logs(unsigned _watchId) const { try { Guard l(m_filterLock); return logs(m_filters.at(m_watches.at(_watchId).id).filter); } catch (...) { return LocalisedLogEntries(); } }
+	virtual LocalisedLogEntries logs(unsigned _watchId) const;
 	virtual LocalisedLogEntries logs(LogFilter const& _filter) const;
 
 	// [EXTRA API]:
@@ -268,10 +267,13 @@ public:
 	virtual h256 hashFromNumber(unsigned _number) const { return m_bc.numberHash(_number); }
 	virtual BlockInfo blockInfo(h256 _hash) const { return BlockInfo(m_bc.block(_hash)); }
 	virtual BlockDetails blockDetails(h256 _hash) const { return m_bc.details(_hash); }
+	virtual Transaction transaction(h256 _transactionHash) const;
 	virtual Transaction transaction(h256 _blockHash, unsigned _i) const;
 	virtual BlockInfo uncle(h256 _blockHash, unsigned _i) const;
 	virtual unsigned transactionCount(h256 _blockHash) const;
 	virtual unsigned uncleCount(h256 _blockHash) const;
+	virtual Transactions transactions(h256 _blockHash) const;
+	virtual TransactionHashes transactionHashes(h256 _blockHash) const;
 
 	/// Differences between transactions.
 	using Interface::diff;
@@ -321,12 +323,12 @@ public:
 	virtual unsigned miningThreads() const { ReadGuard l(x_localMiners); return m_localMiners.size(); }
 	/// Start mining.
 	/// NOT thread-safe - call it & stopMining only from a single thread
-	virtual void startMining() { startWorking(); ReadGuard l(x_localMiners); for (auto& m: m_localMiners) m.start(); }
+	virtual void startMining() { startWorking(); { ReadGuard l(x_localMiners); for (auto& m: m_localMiners) m.start(); } }
 	/// Stop mining.
 	/// NOT thread-safe
-	virtual void stopMining() { ReadGuard l(x_localMiners); for (auto& m: m_localMiners) m.stop(); }
+	virtual void stopMining() { { ReadGuard l(x_localMiners); for (auto& m: m_localMiners) m.stop(); } }
 	/// Are we mining now?
-	virtual bool isMining() { ReadGuard l(x_localMiners); return m_localMiners.size() && m_localMiners[0].isRunning(); }
+	virtual bool isMining() { { ReadGuard l(x_localMiners); if (!m_localMiners.empty() && m_localMiners[0].isRunning()) return true; } return false; }
 	/// Check the progress of the mining.
 	virtual MineProgress miningProgress() const;
 	/// Get and clear the mining history.
@@ -403,8 +405,6 @@ private:
 	bool m_forceMining = false;				///< Mine even when there are no transactions pending?
 	bool m_verifyOwnBlocks = true;			///< Should be verify blocks that we mined?
 
-
-
 	mutable Mutex m_filterLock;
 	std::map<h256, InstalledFilter> m_filters;
 	std::map<unsigned, ClientWatch> m_watches;
diff --git a/libethereum/Interface.h b/libethereum/Interface.h
index 817a5e4b0..abf7c0a2d 100644
--- a/libethereum/Interface.h
+++ b/libethereum/Interface.h
@@ -37,6 +37,14 @@ namespace dev
 namespace eth
 {
 
+using TransactionHashes = h256s;
+
+enum class Reaping
+{
+	Automatic,
+	Manual
+};
+
 /**
  * @brief Main API hub for interfacing with Ethereum.
  */
@@ -65,7 +73,7 @@ public:
 	virtual void flushTransactions() = 0;
 
 	/// Makes the given call. Nothing is recorded into the state.
-	virtual bytes call(Secret _secret, u256 _value, Address _dest, bytes const& _data = bytes(), u256 _gas = 10000, u256 _gasPrice = 10 * szabo) = 0;
+	virtual bytes call(Secret _secret, u256 _value, Address _dest, bytes const& _data = bytes(), u256 _gas = 10000, u256 _gasPrice = 10 * szabo, int _blockNumber = 0) = 0;
 
 	// [STATE-QUERY API]
 
@@ -90,9 +98,11 @@ public:
 	virtual LocalisedLogEntries logs(LogFilter const& _filter) const = 0;
 
 	/// Install, uninstall and query watches.
-	virtual unsigned installWatch(LogFilter const& _filter) = 0;
-	virtual unsigned installWatch(h256 _filterId) = 0;
-	virtual void uninstallWatch(unsigned _watchId) = 0;
+	virtual unsigned installWatch(LogFilter const& _filter, Reaping _r = Reaping::Automatic) = 0;
+	virtual unsigned installWatch(h256 _filterId, Reaping _r = Reaping::Automatic) = 0;
+	virtual bool uninstallWatch(unsigned _watchId) = 0;
+	LocalisedLogEntries peekWatchSafe(unsigned _watchId) const { try { return peekWatch(_watchId); } catch (...) { return LocalisedLogEntries(); } }
+	LocalisedLogEntries checkWatchSafe(unsigned _watchId) { try { return checkWatch(_watchId); } catch (...) { return LocalisedLogEntries(); } }
 	virtual LocalisedLogEntries peekWatch(unsigned _watchId) const = 0;
 	virtual LocalisedLogEntries checkWatch(unsigned _watchId) = 0;
 
@@ -101,10 +111,13 @@ public:
 	virtual h256 hashFromNumber(unsigned _number) const = 0;
 	virtual BlockInfo blockInfo(h256 _hash) const = 0;
 	virtual BlockDetails blockDetails(h256 _hash) const = 0;
+	virtual Transaction transaction(h256 _transactionHash) const = 0;
 	virtual Transaction transaction(h256 _blockHash, unsigned _i) const = 0;
 	virtual BlockInfo uncle(h256 _blockHash, unsigned _i) const = 0;
 	virtual unsigned transactionCount(h256 _blockHash) const = 0;
 	virtual unsigned uncleCount(h256 _blockHash) const = 0;
+	virtual Transactions transactions(h256 _blockHash) const = 0;
+	virtual TransactionHashes transactionHashes(h256 _blockHash) const = 0;
 
 	// [EXTRA API]:
 
diff --git a/libethereum/LogFilter.cpp b/libethereum/LogFilter.cpp
index 1784094b0..45716a949 100644
--- a/libethereum/LogFilter.cpp
+++ b/libethereum/LogFilter.cpp
@@ -30,13 +30,13 @@ using namespace dev::eth;
 std::ostream& dev::eth::operator<<(std::ostream& _out, LogFilter const& _s)
 {
 	// TODO
-	_out << "(@" << _s.m_addresses << "#" << _s.m_topics << ">" << _s.m_earliest << "-" << _s.m_latest << "< +" << _s.m_skip << "^" << _s.m_max << ")";
+	_out << "(@" << _s.m_addresses << "#" << _s.m_topics << ">" << _s.m_earliest << "-" << _s.m_latest << "< )";
 	return _out;
 }
 
 void LogFilter::streamRLP(RLPStream& _s) const
 {
-	_s.appendList(6) << m_addresses << m_topics << m_earliest << m_latest << m_max << m_skip;
+	_s.appendList(4) << m_addresses << m_topics << m_earliest << m_latest;
 }
 
 h256 LogFilter::sha3() const
@@ -73,6 +73,16 @@ bool LogFilter::matches(State const& _s, unsigned _i) const
 	return matches(_s.receipt(_i)).size() > 0;
 }
 
+vector<LogBloom> LogFilter::bloomPossibilities() const
+{
+	// return combination of each of the addresses/topics
+	vector<LogBloom> ret;
+	// TODO proper combinatorics.
+	for (auto i: m_addresses)
+		ret.push_back(LogBloom().shiftBloom<3>(dev::sha3(i)));
+	return ret;
+}
+
 LogEntries LogFilter::matches(TransactionReceipt const& _m) const
 {
 	LogEntries ret;
diff --git a/libethereum/LogFilter.h b/libethereum/LogFilter.h
index 7b8922a03..a28bfe806 100644
--- a/libethereum/LogFilter.h
+++ b/libethereum/LogFilter.h
@@ -45,23 +45,21 @@ class State;
 class LogFilter
 {
 public:
-	LogFilter(int _earliest = 0, int _latest = -1, unsigned _max = 10, unsigned _skip = 0): m_earliest(_earliest), m_latest(_latest), m_max(_max), m_skip(_skip) {}
+	LogFilter(int _earliest = 0, int _latest = -1): m_earliest(_earliest), m_latest(_latest) {}
 
 	void streamRLP(RLPStream& _s) const;
 	h256 sha3() const;
 
 	int earliest() const { return m_earliest; }
 	int latest() const { return m_latest; }
-	unsigned max() const { return m_max; }
-	unsigned skip() const { return m_skip; }
+
+	std::vector<LogBloom> bloomPossibilities() const;
 	bool matches(LogBloom _bloom) const;
 	bool matches(State const& _s, unsigned _i) const;
 	LogEntries matches(TransactionReceipt const& _r) const;
 
 	LogFilter address(Address _a) { m_addresses.insert(_a); return *this; }
 	LogFilter topic(unsigned _index, h256 const& _t) { if (_index < 4) m_topics[_index].insert(_t); return *this; }
-	LogFilter withMax(unsigned _m) { m_max = _m; return *this; }
-	LogFilter withSkip(unsigned _m) { m_skip = _m; return *this; }
 	LogFilter withEarliest(int _e) { m_earliest = _e; return *this; }
 	LogFilter withLatest(int _e) { m_latest = _e; return *this; }
 
@@ -72,8 +70,6 @@ private:
 	std::array<h256Set, 4> m_topics;
 	int m_earliest = 0;
 	int m_latest = -1;
-	unsigned m_max = 10;
-	unsigned m_skip = 0;
 };
 
 }
diff --git a/libethereum/Miner.cpp b/libethereum/Miner.cpp
index a049fca2f..08bc426dc 100644
--- a/libethereum/Miner.cpp
+++ b/libethereum/Miner.cpp
@@ -31,15 +31,15 @@ using namespace dev::eth;
 Miner::~Miner() {}
 
 LocalMiner::LocalMiner(MinerHost* _host, unsigned _id):
-	Worker("miner-" + toString(_id)),
-	m_host(_host)
+	AsyncMiner(_host, _id),
+	Worker("miner-" + toString(_id))
 {
 }
 
 void LocalMiner::setup(MinerHost* _host, unsigned _id)
 {
-	m_host = _host;
-	setName("miner-" + toString(_id));
+	AsyncMiner::setup(_host, _id);
+	setName("miner-" + toString(m_id));
 }
 
 void LocalMiner::doWork()
diff --git a/libethereum/Miner.h b/libethereum/Miner.h
index e472c6f64..7c4f7e767 100644
--- a/libethereum/Miner.h
+++ b/libethereum/Miner.h
@@ -74,6 +74,32 @@ public:
 	virtual bytes const& blockData() const = 0;
 };
 
+class AsyncMiner: public Miner
+{
+public:
+	/// Null constructor.
+	AsyncMiner(): m_host(nullptr) {}
+
+	/// Constructor.
+	AsyncMiner(MinerHost* _host, unsigned _id = 0): m_host(_host), m_id(_id) {}
+
+	/// Setup its basics.
+	void setup(MinerHost* _host, unsigned _id = 0) { m_host = _host; m_id = _id; }
+
+	/// Start mining.
+	virtual void start() {}
+
+	/// Stop mining.
+	virtual void stop() {}
+
+	/// @returns true iff the mining has been start()ed. It may still not be actually mining, depending on the host's turbo() & force().
+	virtual bool isRunning() { return false; }
+
+protected:
+	MinerHost* m_host = nullptr;			///< Our host.
+	unsigned m_id = 0;						///< Our unique id.
+};
+
 /**
  * @brief Implements Miner.
  * To begin mining, use start() & stop(). noteStateChange() can be used to reset the mining and set up the
@@ -86,11 +112,11 @@ public:
  * @threadsafe
  * @todo Signal Miner to restart once with condition variables.
  */
-class LocalMiner: public Miner, Worker
+class LocalMiner: public AsyncMiner, Worker
 {
 public:
 	/// Null constructor.
-	LocalMiner(): m_host(nullptr) {}
+	LocalMiner() {}
 
 	/// Constructor.
 	LocalMiner(MinerHost* _host, unsigned _id = 0);
@@ -138,8 +164,6 @@ private:
 	/// Do some work on the mining.
 	virtual void doWork();
 
-	MinerHost* m_host = nullptr;			///< Our host.
-
 	enum MiningStatus { Waiting, Preparing, Mining, Mined, Stopping, Stopped };
 	MiningStatus m_miningStatus = Waiting;	///< TODO: consider mutex/atomic variable.
 	State m_mineState;						///< The state on which we are mining, generally equivalent to m_postMine.
diff --git a/libevm/ExtVMFace.h b/libevm/ExtVMFace.h
index 4c6bcad0c..79b97a252 100644
--- a/libevm/ExtVMFace.h
+++ b/libevm/ExtVMFace.h
@@ -47,9 +47,9 @@ struct LogEntry
 	LogBloom bloom() const
 	{
 		LogBloom ret;
-		ret.shiftBloom<3, 32>(sha3(address.ref()));
+		ret.shiftBloom<3>(sha3(address.ref()));
 		for (auto t: topics)
-			ret.shiftBloom<3, 32>(sha3(t.ref()));
+			ret.shiftBloom<3>(sha3(t.ref()));
 		return ret;
 	}
 
diff --git a/libevm/VM.cpp b/libevm/VM.cpp
index e0b487c9b..6f6e08d4c 100644
--- a/libevm/VM.cpp
+++ b/libevm/VM.cpp
@@ -341,8 +341,10 @@ bytesConstRef VM::go(ExtVMFace& _ext, OnOpFunc const& _onOp, uint64_t _steps)
 			break;
 		case Instruction::CALLDATALOAD:
 		{
-			if ((unsigned)m_stack.back() + (uint64_t)31 < _ext.data.size())
-				m_stack.back() = (u256)*(h256 const*)(_ext.data.data() + (unsigned)m_stack.back());
+			if ((bigint)m_stack.back() + 31 < _ext.data.size())
+				m_stack.back() = (u256)*(h256 const*)(_ext.data.data() + (size_t)m_stack.back());
+			else if ((bigint)m_stack.back() >= _ext.data.size())
+				m_stack.back() = u256();
 			else
 			{
 				h256 r;
diff --git a/libevmcore/Assembly.h b/libevmcore/Assembly.h
index 1cbb12e12..242f6f1ff 100644
--- a/libevmcore/Assembly.h
+++ b/libevmcore/Assembly.h
@@ -71,7 +71,7 @@ private:
 	AssemblyItemType m_type;
 	u256 m_data;
 	SourceLocation m_location;
-	JumpType m_jumpType;
+	JumpType m_jumpType = JumpType::Ordinary;
 };
 
 using AssemblyItems = std::vector<AssemblyItem>;
diff --git a/libjsqrc/CMakeLists.txt b/libjsqrc/CMakeLists.txt
index 68500ada6..4e849de12 100644
--- a/libjsqrc/CMakeLists.txt
+++ b/libjsqrc/CMakeLists.txt
@@ -12,7 +12,7 @@ qt5_add_resources(JSQRC js.qrc)
 add_library(jsqrc STATIC ${JSQRC})
 target_link_libraries(jsqrc Qt5::Core)
 
-if (ETH_NODE AND ETH_NPM)
+if (USENPM)
 	add_custom_target(ethereumjs)
 	add_custom_command(TARGET ethereumjs
 		POST_BUILD
@@ -23,3 +23,7 @@ if (ETH_NODE AND ETH_NPM)
 endif()
 
 install( TARGETS jsqrc RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
+
+file(GLOB_RECURSE JSFILES "ethereumjs/lib/*.js")
+add_custom_target(aux_js SOURCES ${JSFILES})
+
diff --git a/libjsqrc/ethereumjs/.travis.yml b/libjsqrc/ethereumjs/.travis.yml
index 558fd1537..6dcfc17d1 100644
--- a/libjsqrc/ethereumjs/.travis.yml
+++ b/libjsqrc/ethereumjs/.travis.yml
@@ -1,13 +1,17 @@
 language: node_js
 node_js:
+  - "0.12"
   - "0.11"
   - "0.10"
 before_script:
   - npm install
   - npm install jshint
+  - export DISPLAY=:99.0 
+  - sh -e /etc/init.d/xvfb start
 script:
    - "jshint *.js lib"
 after_script:
   - npm run-script build
+  - npm run-script karma
   - npm run-script test-coveralls
 
diff --git a/libjsqrc/ethereumjs/.versions b/libjsqrc/ethereumjs/.versions
new file mode 100644
index 000000000..ed4a55b6a
--- /dev/null
+++ b/libjsqrc/ethereumjs/.versions
@@ -0,0 +1,4 @@
+3stack:bignumber@2.0.0
+ethereum:js@0.0.15-rc12
+meteor@1.1.4
+underscore@1.0.2
diff --git a/libjsqrc/ethereumjs/README.md b/libjsqrc/ethereumjs/README.md
index 30c20aafa..a153b89ba 100644
--- a/libjsqrc/ethereumjs/README.md
+++ b/libjsqrc/ethereumjs/README.md
@@ -1,57 +1,64 @@
 # 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/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, for bower and component as an embeddable js and as a meteor.js package.
 
 [![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]
 
 <!-- [![browser support](https://ci.testling.com/ethereum/ethereum.js.png)](https://ci.testling.com/ethereum/ethereum.js) -->
 
+You need to run a local ethrereum node to use this library.
+
+[Documentation](https://github.com/ethereum/wiki/wiki/JavaScript-API)
+
 ## Installation
 
 ### Node.js
 
-    npm install ethereum.js
+    $ npm install ethereum.js
+
+### Meteor.js
 
-### For browser
+    $ meteor add ethereum:js
+
+### As Browser module
 Bower
 
-	bower install ethereum.js
+	$ bower install ethereum.js
 
 Component
 
-	component install ethereum/ethereum.js
+	$ component install ethereum/ethereum.js
 
-* Include `ethereum.min.js` in your html file.
-* Include [bignumber.js](https://github.com/MikeMcl/bignumber.js/)
+* Include `ethereum.min.js` in your html file. (not required for the meteor package)
+* Include [bignumber.js](https://github.com/MikeMcl/bignumber.js/) (not required for the meteor package)
 
 ## Usage
-Require the library:
+Require the library (not required for the meteor package):
 
 	var web3 = require('web3');
 
-Set a provider (QtSyncProvider, HttpSyncProvider)
+Set a provider (QtSyncProvider, HttpProvider)
 
-	web3.setProvider(new web3.providers.HttpSyncProvider());
+	web3.setProvider(new web3.providers.HttpProvider('http://localhost:8545'));
 
 There you go, now you can use it:
 
 ```
 var coinbase = web3.eth.coinbase;
-var balance = web3.eth.balanceAt(coinbase);
+var balance = web3.eth.getBalance(coinbase);
 ```
 
 
 For another example see `example/index.html`.
 
+
 ## Contribute!
 
 ### Requirements
 
 * Node.js
 * npm
-* gulp (build)
-* mocha (tests)
 
 ```bash
 sudo apt-get update
@@ -73,6 +80,15 @@ npm run-script build
 npm test
 ```
 
+### Testing (karma)
+Karma allows testing within one or several browsers.
+
+```bash
+npm run-script karma # default browsers are Chrome and Firefox
+npm run-script karma -- --browsers="Chrome,Safari" # custom browsers
+```
+
+
 **Please note this repo is in it's early stage.**
 
 If you'd like to run a Http ethereum node check out
diff --git a/libjsqrc/ethereumjs/bower.json b/libjsqrc/ethereumjs/bower.json
index f0cb33321..5fe92754b 100644
--- a/libjsqrc/ethereumjs/bower.json
+++ b/libjsqrc/ethereumjs/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "ethereum.js",
   "namespace": "ethereum",
-  "version": "0.0.16",
+  "version": "0.1.2",
   "description": "Ethereum Compatible JavaScript API",
   "main": [
     "./dist/ethereum.js",
@@ -33,6 +33,11 @@
       "name": "Marian Oancea",
       "email": "marian@ethdev.com",
       "homepage": "https://github.com/cubedro"
+    },
+    {
+      "name": "Fabian Vogelsteller",
+      "email": "fabian@ethdev.com",
+      "homepage": "https://github.com/frozeman"
     }
   ],
   "license": "LGPL-3.0",
@@ -41,6 +46,8 @@
     "lib",
     "node_modules",
     "package.json",
+    "package.js",
+    ".versions",
     ".bowerrc",
     ".editorconfig",
     ".gitignore",
diff --git a/libjsqrc/ethereumjs/dist/ethereum.js b/libjsqrc/ethereumjs/dist/ethereum.js
index 69d393699..4ae476ca5 100644
--- a/libjsqrc/ethereumjs/dist/ethereum.js
+++ b/libjsqrc/ethereumjs/dist/ethereum.js
@@ -22,34 +22,57 @@ require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof requ
  * @date 2014
  */
 
-var utils = require('./utils');
+var utils = require('../utils/utils');
+var c = require('../utils/config');
 var types = require('./types');
-var c = require('./const');
 var f = require('./formatters');
 
-var displayTypeError = function (type) {
-    console.error('parser does not support type: ' + type);
+/**
+ * throw incorrect type error
+ *
+ * @method throwTypeError
+ * @param {String} type
+ * @throws incorrect type error
+ */
+var throwTypeError = function (type) {
+    throw new Error('parser does not support type: ' + type);
 };
 
-/// This method should be called if we want to check if givent type is an array type
-/// @returns true if it is, otherwise false
-var arrayType = function (type) {
+/** This method should be called if we want to check if givent type is an array type
+ *
+ * @method isArrayType
+ * @param {String} type name
+ * @returns {Boolean} true if it is, otherwise false
+ */
+var isArrayType = function (type) {
     return type.slice(-2) === '[]';
 };
 
+/**
+ * This method should be called to return dynamic type length in hex
+ *
+ * @method dynamicTypeBytes
+ * @param {String} type
+ * @param {String|Array} dynamic type
+ * @return {String} length of dynamic type in hex or empty string if type is not dynamic
+ */
 var dynamicTypeBytes = function (type, value) {
     // TODO: decide what to do with array of strings
-    if (arrayType(type) || type === 'string')    // only string itself that is dynamic; stringX is static length.
+    if (isArrayType(type) || type === 'bytes')
         return f.formatInputInt(value.length);
     return "";
 };
 
 var inputTypes = types.inputTypes();
 
-/// Formats input params to bytes
-/// @param abi contract method inputs
-/// @param array of params that will be formatted to bytes
-/// @returns bytes representation of input params
+/**
+ * Formats input params to bytes
+ *
+ * @method formatInput
+ * @param {Array} abi inputs of method
+ * @param {Array} params that will be formatted to bytes
+ * @returns bytes representation of input params
+ */
 var formatInput = function (inputs, params) {
     var bytes = "";
     var toAppendConstant = "";
@@ -67,16 +90,16 @@ var formatInput = function (inputs, params) {
             typeMatch = inputTypes[j].type(inputs[i].type, params[i]);
         }
         if (!typeMatch) {
-            displayTypeError(inputs[i].type);
+            throwTypeError(inputs[i].type);
         }
 
         var formatter = inputTypes[j - 1].format;
 
-        if (arrayType(inputs[i].type))
+        if (isArrayType(inputs[i].type))
             toAppendArrayContent += params[i].reduce(function (acc, curr) {
                 return acc + formatter(curr);
             }, "");
-        else if (inputs[i].type === 'string')
+        else if (inputs[i].type === 'bytes')
             toAppendArrayContent += formatter(params[i]);
         else
             toAppendConstant += formatter(params[i]);
@@ -87,18 +110,29 @@ var formatInput = function (inputs, params) {
     return bytes;
 };
 
+/**
+ * This method should be called to predict the length of dynamic type
+ *
+ * @method dynamicBytesLength
+ * @param {String} type
+ * @returns {Number} length of dynamic type, 0 or multiplication of ETH_PADDING (32)
+ */
 var dynamicBytesLength = function (type) {
-    if (arrayType(type) || type === 'string')   // only string itself that is dynamic; stringX is static length.
+    if (isArrayType(type) || type === 'bytes')
         return c.ETH_PADDING * 2;
     return 0;
 };
 
 var outputTypes = types.outputTypes();
 
-/// Formats output bytes back to param list
-/// @param contract abi method outputs
-/// @param bytes representtion of output
-/// @returns array of output params
+/** 
+ * Formats output bytes back to param list
+ *
+ * @method formatOutput
+ * @param {Array} abi outputs of method
+ * @param {String} bytes represention of output
+ * @returns {Array} output params
+ */
 var formatOutput = function (outs, output) {
 
     output = output.slice(2);
@@ -120,11 +154,11 @@ var formatOutput = function (outs, output) {
         }
 
         if (!typeMatch) {
-            displayTypeError(outs[i].type);
+            throwTypeError(outs[i].type);
         }
 
         var formatter = outputTypes[j - 1].format;
-        if (arrayType(outs[i].type)) {
+        if (isArrayType(outs[i].type)) {
             var size = f.formatOutputUInt(dynamicPart.slice(0, padding));
             dynamicPart = dynamicPart.slice(padding);
             var array = [];
@@ -134,7 +168,7 @@ var formatOutput = function (outs, output) {
             }
             result.push(array);
         }
-        else if (types.prefixedType('string')(outs[i].type)) {
+        else if (types.prefixedType('bytes')(outs[i].type)) {
             dynamicPart = dynamicPart.slice(padding);
             result.push(formatter(output.slice(0, padding)));
             output = output.slice(padding);
@@ -147,9 +181,14 @@ var formatOutput = function (outs, output) {
     return result;
 };
 
-/// @param json abi for contract
-/// @returns input parser object for given json abi
-/// TODO: refactor creating the parser, do not double logic from contract
+/**
+ * Should be called to create input parser for contract with given abi
+ *
+ * @method inputParser
+ * @param {Array} contract abi
+ * @returns {Object} input parser object for given json abi
+ * TODO: refactor creating the parser, do not double logic from contract
+ */
 var inputParser = function (json) {
     var parser = {};
     json.forEach(function (method) {
@@ -171,8 +210,13 @@ var inputParser = function (json) {
     return parser;
 };
 
-/// @param json abi for contract
-/// @returns output parser for given json abi
+/**
+ * Should be called to create output parser for contract with given abi
+ *
+ * @method outputParser
+ * @param {Array} contract abi
+ * @returns {Object} output parser for given json abi
+ */
 var outputParser = function (json) {
     var parser = {};
     json.forEach(function (method) {
@@ -201,7 +245,302 @@ module.exports = {
     formatOutput: formatOutput
 };
 
-},{"./const":2,"./formatters":8,"./types":15,"./utils":16}],2:[function(require,module,exports){
+},{"../utils/config":4,"../utils/utils":5,"./formatters":2,"./types":3}],2:[function(require,module,exports){
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js 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 Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file formatters.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ * @date 2015
+ */
+
+if ("build" !== 'build') {/*
+    var BigNumber = require('bignumber.js'); // jshint ignore:line
+*/}
+
+var utils = require('../utils/utils');
+var c = require('../utils/config');
+
+/**
+ * Should be called to pad string to expected length
+ *
+ * @method padLeft
+ * @param {String} string to be padded
+ * @param {Number} characters that result string should have
+ * @param {String} sign, by default 0
+ * @returns {String} right aligned string
+ */
+var padLeft = function (string, chars, sign) {
+    return new Array(chars - string.length + 1).join(sign ? sign : "0") + string;
+};
+
+/**
+ * Formats input value to byte representation of int
+ * If value is negative, return it's two's complement
+ * If the value is floating point, round it down
+ *
+ * @method formatInputInt
+ * @param {String|Number|BigNumber} value that needs to be formatted
+ * @returns {String} right-aligned byte representation of int
+ */
+var formatInputInt = function (value) {
+    var padding = c.ETH_PADDING * 2;
+    BigNumber.config(c.ETH_BIGNUMBER_ROUNDING_MODE);
+    return padLeft(utils.toTwosComplement(value).round().toString(16), padding);
+};
+
+/**
+ * Formats input value to byte representation of string
+ *
+ * @method formatInputString
+ * @param {String}
+ * @returns {String} left-algined byte representation of string
+ */
+var formatInputString = function (value) {
+    return utils.fromAscii(value, c.ETH_PADDING).substr(2);
+};
+
+/**
+ * Formats input value to byte representation of bool
+ *
+ * @method formatInputBool
+ * @param {Boolean}
+ * @returns {String} right-aligned byte representation bool
+ */
+var formatInputBool = function (value) {
+    return '000000000000000000000000000000000000000000000000000000000000000' + (value ?  '1' : '0');
+};
+
+/**
+ * Formats input value to byte representation of real
+ * Values are multiplied by 2^m and encoded as integers
+ *
+ * @method formatInputReal
+ * @param {String|Number|BigNumber}
+ * @returns {String} byte representation of real
+ */
+var formatInputReal = function (value) {
+    return formatInputInt(new BigNumber(value).times(new BigNumber(2).pow(128))); 
+};
+
+/**
+ * Check if input value is negative
+ *
+ * @method signedIsNegative
+ * @param {String} value is hex format
+ * @returns {Boolean} true if it is negative, otherwise false
+ */
+var signedIsNegative = function (value) {
+    return (new BigNumber(value.substr(0, 1), 16).toString(2).substr(0, 1)) === '1';
+};
+
+/**
+ * Formats right-aligned output bytes to int
+ *
+ * @method formatOutputInt
+ * @param {String} bytes
+ * @returns {BigNumber} right-aligned output bytes formatted to big number
+ */
+var formatOutputInt = function (value) {
+
+    value = value || "0";
+
+    // check if it's negative number
+    // it it is, return two's complement
+    if (signedIsNegative(value)) {
+        return new BigNumber(value, 16).minus(new BigNumber('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', 16)).minus(1);
+    }
+    return new BigNumber(value, 16);
+};
+
+/**
+ * Formats right-aligned output bytes to uint
+ *
+ * @method formatOutputUInt
+ * @param {String} bytes
+ * @returns {BigNumeber} right-aligned output bytes formatted to uint
+ */
+var formatOutputUInt = function (value) {
+    value = value || "0";
+    return new BigNumber(value, 16);
+};
+
+/**
+ * Formats right-aligned output bytes to real
+ *
+ * @method formatOutputReal
+ * @param {String}
+ * @returns {BigNumber} input bytes formatted to real
+ */
+var formatOutputReal = function (value) {
+    return formatOutputInt(value).dividedBy(new BigNumber(2).pow(128)); 
+};
+
+/**
+ * Formats right-aligned output bytes to ureal
+ *
+ * @method formatOutputUReal
+ * @param {String}
+ * @returns {BigNumber} input bytes formatted to ureal
+ */
+var formatOutputUReal = function (value) {
+    return formatOutputUInt(value).dividedBy(new BigNumber(2).pow(128)); 
+};
+
+/**
+ * Should be used to format output hash
+ *
+ * @method formatOutputHash
+ * @param {String}
+ * @returns {String} right-aligned output bytes formatted to hex
+ */
+var formatOutputHash = function (value) {
+    return "0x" + value;
+};
+
+/**
+ * Should be used to format output bool
+ *
+ * @method formatOutputBool
+ * @param {String}
+ * @returns {Boolean} right-aligned input bytes formatted to bool
+ */
+var formatOutputBool = function (value) {
+    return value === '0000000000000000000000000000000000000000000000000000000000000001' ? true : false;
+};
+
+/**
+ * Should be used to format output string
+ *
+ * @method formatOutputString
+ * @param {Sttring} left-aligned hex representation of string
+ * @returns {String} ascii string
+ */
+var formatOutputString = function (value) {
+    return utils.toAscii(value);
+};
+
+/**
+ * Should be used to format output address
+ *
+ * @method formatOutputAddress
+ * @param {String} right-aligned input bytes
+ * @returns {String} address
+ */
+var formatOutputAddress = function (value) {
+    return "0x" + value.slice(value.length - 40, value.length);
+};
+
+module.exports = {
+    formatInputInt: formatInputInt,
+    formatInputString: formatInputString,
+    formatInputBool: formatInputBool,
+    formatInputReal: formatInputReal,
+    formatOutputInt: formatOutputInt,
+    formatOutputUInt: formatOutputUInt,
+    formatOutputReal: formatOutputReal,
+    formatOutputUReal: formatOutputUReal,
+    formatOutputHash: formatOutputHash,
+    formatOutputBool: formatOutputBool,
+    formatOutputString: formatOutputString,
+    formatOutputAddress: formatOutputAddress
+};
+
+
+},{"../utils/config":4,"../utils/utils":5}],3:[function(require,module,exports){
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js 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 Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file types.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ * @date 2015
+ */
+
+var f = require('./formatters');
+
+/// @param expected type prefix (string)
+/// @returns function which checks if type has matching prefix. if yes, returns true, otherwise false
+var prefixedType = function (prefix) {
+    return function (type) {
+        return type.indexOf(prefix) === 0;
+    };
+};
+
+/// @param expected type name (string)
+/// @returns function which checks if type is matching expected one. if yes, returns true, otherwise false
+var namedType = function (name) {
+    return function (type) {
+        return name === type;
+    };
+};
+
+/// Setups input formatters for solidity types
+/// @returns an array of input formatters 
+var inputTypes = function () {
+    
+    return [
+        { type: prefixedType('uint'), format: f.formatInputInt },
+        { type: prefixedType('int'), format: f.formatInputInt },
+        { type: prefixedType('bytes'), format: f.formatInputString }, 
+        { type: prefixedType('real'), format: f.formatInputReal },
+        { type: prefixedType('ureal'), format: f.formatInputReal },
+        { type: namedType('address'), format: f.formatInputInt },
+        { type: namedType('bool'), format: f.formatInputBool }
+    ];
+};
+
+/// Setups output formaters for solidity types
+/// @returns an array of output formatters
+var outputTypes = function () {
+
+    return [
+        { type: prefixedType('uint'), format: f.formatOutputUInt },
+        { type: prefixedType('int'), format: f.formatOutputInt },
+        { type: prefixedType('bytes'), format: f.formatOutputString },
+        { type: prefixedType('real'), format: f.formatOutputReal },
+        { type: prefixedType('ureal'), format: f.formatOutputUReal },
+        { type: namedType('address'), format: f.formatOutputAddress },
+        { type: namedType('bool'), format: f.formatOutputBool }
+    ];
+};
+
+module.exports = {
+    prefixedType: prefixedType,
+    namedType: namedType,
+    inputTypes: inputTypes,
+    outputTypes: outputTypes
+};
+
+
+},{"./formatters":2}],4:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -218,12 +557,25 @@ module.exports = {
     You should have received a copy of the GNU Lesser General Public License
     along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-/** @file const.js
+/** @file config.js
  * @authors:
  *   Marek Kotewicz <marek@ethdev.com>
  * @date 2015
  */
 
+/**
+ * Utils
+ * 
+ * @module utils
+ */
+
+/**
+ * Utility functions
+ * 
+ * @class [utils] config
+ * @constructor
+ */
+
 /// required to define ETH_BIGNUMBER_ROUNDING_MODE
 if ("build" !== 'build') {/*
     var BigNumber = require('bignumber.js'); // jshint ignore:line
@@ -256,11 +608,764 @@ module.exports = {
     ETH_SIGNATURE_LENGTH: 4,
     ETH_UNITS: ETH_UNITS,
     ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN },
-    ETH_POLLING_TIMEOUT: 1000
+    ETH_POLLING_TIMEOUT: 1000,
+    ETH_DEFAULTBLOCK: 'latest'
 };
 
 
-},{}],3:[function(require,module,exports){
+},{}],5:[function(require,module,exports){
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js 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 Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file utils.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ * @date 2015
+ */
+
+/**
+ * Utils
+ * 
+ * @module utils
+ */
+
+/**
+ * Utility functions
+ * 
+ * @class [utils] utils
+ * @constructor
+ */
+
+if ("build" !== 'build') {/*
+    var BigNumber = require('bignumber.js'); // jshint ignore:line
+*/}
+
+var unitMap = {
+    'wei':      '1',
+    'kwei':     '1000',
+    'ada':      '1000',
+    'mwei':     '1000000',
+    'babbage':  '1000000',
+    'gwei':     '1000000000',
+    'shannon':  '1000000000',
+    'szabo':    '1000000000000',
+    'finney':   '1000000000000000',
+    'ether':    '1000000000000000000',
+    'kether':   '1000000000000000000000',
+    'grand':    '1000000000000000000000',
+    'einstein': '1000000000000000000000',
+    'mether':   '1000000000000000000000000',
+    'gether':   '1000000000000000000000000000',
+    'tether':   '1000000000000000000000000000000'
+};
+
+
+/** Finds first index of array element matching pattern
+ *
+ * @method findIndex
+ * @param {Array}
+ * @param {Function} pattern
+ * @returns {Number} index of element
+ */
+var findIndex = function (array, callback) {
+    var end = false;
+    var i = 0;
+    for (; i < array.length && !end; i++) {
+        end = callback(array[i]);
+    }
+    return end ? i - 1 : -1;
+};
+
+/** 
+ * Should be called to get sting from it's hex representation
+ *
+ * @method toAscii
+ * @param {String} string in hex
+ * @returns {String} ascii string representation of hex value
+ */
+var toAscii = function(hex) {
+// Find termination
+    var str = "";
+    var i = 0, l = hex.length;
+    if (hex.substring(0, 2) === '0x') {
+        i = 2;
+    }
+    for (; i < l; i+=2) {
+        var code = parseInt(hex.substr(i, 2), 16);
+        if (code === 0) {
+            break;
+        }
+
+        str += String.fromCharCode(code);
+    }
+
+    return str;
+};
+    
+/**
+ * Shold be called to get hex representation (prefixed by 0x) of ascii string 
+ *
+ * @method fromAscii
+ * @param {String} string
+ * @returns {String} hex representation of input string
+ */
+var toHexNative = function(str) {
+    var hex = "";
+    for(var i = 0; i < str.length; i++) {
+        var n = str.charCodeAt(i).toString(16);
+        hex += n.length < 2 ? '0' + n : n;
+    }
+
+    return hex;
+};
+
+/**
+ * Shold be called to get hex representation (prefixed by 0x) of ascii string 
+ *
+ * @method fromAscii
+ * @param {String} string
+ * @param {Number} optional padding
+ * @returns {String} hex representation of input string
+ */
+var fromAscii = function(str, pad) {
+    pad = pad === undefined ? 0 : pad;
+    var hex = toHexNative(str);
+    while (hex.length < pad*2)
+        hex += "00";
+    return "0x" + hex;
+};
+
+/**
+ * Should be called to get display name of contract function
+ * 
+ * @method extractDisplayName
+ * @param {String} name of function/event
+ * @returns {String} display name for function/event eg. multiply(uint256) -> multiply
+ */
+var extractDisplayName = function (name) {
+    var length = name.indexOf('('); 
+    return length !== -1 ? name.substr(0, length) : name;
+};
+
+/// @returns overloaded part of function/event name
+var extractTypeName = function (name) {
+    /// TODO: make it invulnerable
+    var length = name.indexOf('(');
+    return length !== -1 ? name.substr(length + 1, name.length - 1 - (length + 1)).replace(' ', '') : "";
+};
+
+/**
+ * Filters all functions from input abi
+ *
+ * @method filterFunctions
+ * @param {Array} abi
+ * @returns {Array} abi array with filtered objects of type 'function'
+ */
+var filterFunctions = function (json) {
+    return json.filter(function (current) {
+        return current.type === 'function'; 
+    }); 
+};
+
+/**
+ * Filters all events from input abi
+ *
+ * @method filterEvents
+ * @param {Array} abi
+ * @returns {Array} abi array with filtered objects of type 'event'
+ */
+var filterEvents = function (json) {
+    return json.filter(function (current) {
+        return current.type === 'event';
+    });
+};
+
+/**
+ * Converts value to it's decimal representation in string
+ *
+ * @method toDecimal
+ * @param {String|Number|BigNumber}
+ * @return {String}
+ */
+var toDecimal = function (value) {
+    return toBigNumber(value).toNumber();
+};
+
+/**
+ * Converts value to it's hex representation
+ *
+ * @method fromDecimal
+ * @param {String|Number|BigNumber}
+ * @return {String}
+ */
+var fromDecimal = function (value) {
+    var number = toBigNumber(value);
+    var result = number.toString(16);
+
+    return number.lessThan(0) ? '-0x' + result.substr(1) : '0x' + result;
+};
+
+/**
+ * Auto converts any given value into it's hex representation.
+ *
+ * And even stringifys objects before.
+ *
+ * @method toHex
+ * @param {String|Number|BigNumber|Object}
+ * @return {String}
+ */
+var toHex = function (val) {
+    /*jshint maxcomplexity:7 */
+
+    if(isBoolean(val))
+        return val;
+
+    if(isBigNumber(val))
+        return fromDecimal(val);
+
+    if(isObject(val))
+        return fromAscii(JSON.stringify(val));
+
+    // if its a negative number, pass it through fromDecimal
+    if (isString(val)) {
+        if (val.indexOf('-0x') === 0)
+           return fromDecimal(val);
+        else if (!isFinite(val))
+            return fromAscii(val);
+    }
+
+    return fromDecimal(val);
+};
+
+/**
+ * Returns value of unit in Wei
+ *
+ * @method getValueOfUnit
+ * @param {String} unit the unit to convert to, default ether
+ * @returns {BigNumber} value of the unit (in Wei)
+ * @throws error if the unit is not correct:w
+ */
+var getValueOfUnit = function (unit) {
+    unit = unit ? unit.toLowerCase() : 'ether';
+    var unitValue = unitMap[unit];
+    if (unitValue === undefined) {
+        throw new Error('This unit doesn\'t exists, please use the one of the following units' + JSON.stringify(unitMap, null, 2));
+    }
+    return new BigNumber(unitValue, 10);
+};
+
+/**
+ * Takes a number of wei and converts it to any other ether unit.
+ *
+ * Possible units are:
+ * - kwei/ada
+ * - mwei/babbage
+ * - gwei/shannon
+ * - szabo
+ * - finney
+ * - ether
+ * - kether/grand/einstein
+ * - mether
+ * - gether
+ * - tether
+ *
+ * @method fromWei
+ * @param {Number|String} number can be a number, number string or a HEX of a decimal
+ * @param {String} unit the unit to convert to, default ether
+ * @return {String|Object} When given a BigNumber object it returns one as well, otherwise a number
+*/
+var fromWei = function(number, unit) {
+    var returnValue = toBigNumber(number).dividedBy(getValueOfUnit(unit));
+
+    return isBigNumber(number) ? returnValue : returnValue.toString(10); 
+};
+
+/**
+ * Takes a number of a unit and converts it to wei.
+ *
+ * Possible units are:
+ * - kwei/ada
+ * - mwei/babbage
+ * - gwei/shannon
+ * - szabo
+ * - finney
+ * - ether
+ * - kether/grand/einstein
+ * - mether
+ * - gether
+ * - tether
+ *
+ * @method toWei
+ * @param {Number|String|BigNumber} number can be a number, number string or a HEX of a decimal
+ * @param {String} unit the unit to convert from, default ether
+ * @return {String|Object} When given a BigNumber object it returns one as well, otherwise a number
+*/
+var toWei = function(number, unit) {
+    var returnValue = toBigNumber(number).times(getValueOfUnit(unit));
+
+    return isBigNumber(number) ? returnValue : returnValue.toString(10); 
+};
+
+/**
+ * Takes an input and transforms it into an bignumber
+ *
+ * @method toBigNumber
+ * @param {Number|String|BigNumber} a number, string, HEX string or BigNumber
+ * @return {BigNumber} BigNumber
+*/
+var toBigNumber = function(number) {
+    /*jshint maxcomplexity:5 */
+    number = number || 0;
+    if (isBigNumber(number))
+        return number;
+
+    if (isString(number) && (number.indexOf('0x') === 0 || number.indexOf('-0x') === 0)) {
+        return new BigNumber(number.replace('0x',''), 16);
+    }
+   
+    return new BigNumber(number.toString(10), 10);
+};
+
+/**
+ * Takes and input transforms it into bignumber and if it is negative value, into two's complement
+ *
+ * @method toTwosComplement
+ * @param {Number|String|BigNumber}
+ * @return {BigNumber}
+ */
+var toTwosComplement = function (number) {
+    var bigNumber = toBigNumber(number);
+    if (bigNumber.lessThan(0)) {
+        return new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).plus(bigNumber).plus(1);
+    }
+    return bigNumber;
+};
+
+/**
+ * Checks if the given string has proper length
+ *
+ * @method isAddress
+ * @param {String} address the given HEX adress
+ * @return {Boolean}
+*/
+var isAddress = function(address) {
+    if (!isString(address)) {
+        return false;
+    }
+
+    return ((address.indexOf('0x') === 0 && address.length === 42) ||
+            (address.indexOf('0x') === -1 && address.length === 40));
+};
+
+/**
+ * Returns true if object is BigNumber, otherwise false
+ *
+ * @method isBigNumber
+ * @param {Object}
+ * @return {Boolean} 
+ */
+var isBigNumber = function (object) {
+    return object instanceof BigNumber ||
+        (object && object.constructor && object.constructor.name === 'BigNumber');
+};
+
+/**
+ * Returns true if object is string, otherwise false
+ * 
+ * @method isString
+ * @param {Object}
+ * @return {Boolean}
+ */
+var isString = function (object) {
+    return typeof object === 'string' ||
+        (object && object.constructor && object.constructor.name === 'String');
+};
+
+/**
+ * Returns true if object is function, otherwise false
+ *
+ * @method isFunction
+ * @param {Object}
+ * @return {Boolean}
+ */
+var isFunction = function (object) {
+    return typeof object === 'function';
+};
+
+/**
+ * Returns true if object is Objet, otherwise false
+ *
+ * @method isObject
+ * @param {Object}
+ * @return {Boolean}
+ */
+var isObject = function (object) {
+    return typeof object === 'object';
+};
+
+/**
+ * Returns true if object is boolean, otherwise false
+ *
+ * @method isBoolean
+ * @param {Object}
+ * @return {Boolean}
+ */
+var isBoolean = function (object) {
+    return typeof object === 'boolean';
+};
+
+/**
+ * Returns true if object is array, otherwise false
+ *
+ * @method isArray
+ * @param {Object}
+ * @return {Boolean}
+ */
+var isArray = function (object) {
+    return object instanceof Array; 
+};
+
+module.exports = {
+    findIndex: findIndex,
+    toHex: toHex,
+    toDecimal: toDecimal,
+    fromDecimal: fromDecimal,
+    toAscii: toAscii,
+    fromAscii: fromAscii,
+    extractDisplayName: extractDisplayName,
+    extractTypeName: extractTypeName,
+    filterFunctions: filterFunctions,
+    filterEvents: filterEvents,
+    toWei: toWei,
+    fromWei: fromWei,
+    toBigNumber: toBigNumber,
+    toTwosComplement: toTwosComplement,
+    isBigNumber: isBigNumber,
+    isAddress: isAddress,
+    isFunction: isFunction,
+    isString: isString,
+    isObject: isObject,
+    isBoolean: isBoolean,
+    isArray: isArray
+};
+
+
+},{}],6:[function(require,module,exports){
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js 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 Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file web3.js
+ * @authors:
+ *   Jeffrey Wilcke <jeff@ethdev.com>
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Marian Oancea <marian@ethdev.com>
+ *   Fabian Vogelsteller <fabian@ethdev.com>
+ *   Gav Wood <g@ethdev.com>
+ * @date 2014
+ */
+
+var version = require('../version.json');
+var net = require('./web3/net');
+var eth = require('./web3/eth');
+var db = require('./web3/db');
+var shh = require('./web3/shh');
+var watches = require('./web3/watches');
+var filter = require('./web3/filter');
+var utils = require('./utils/utils');
+var formatters = require('./solidity/formatters');
+var requestManager = require('./web3/requestmanager');
+var c = require('./utils/config');
+
+/// @returns an array of objects describing web3 api methods
+var web3Methods = [
+    { name: 'sha3', call: 'web3_sha3', inputFormatter: utils.toHex },
+];
+var web3Properties = [
+    { name: 'version.client', getter: 'web3_clientVersion' },
+    { name: 'version.network', getter: 'net_version' }
+];
+
+
+/// creates methods in a given object based on method description on input
+/// setups api calls for these methods
+var setupMethods = function (obj, methods) {
+    methods.forEach(function (method) {
+        // allow for object methods 'myObject.method'
+        var objectMethods = method.name.split('.'),
+            callFunction = function () {
+                /*jshint maxcomplexity:8 */
+                
+                var callback = null,
+                    args = Array.prototype.slice.call(arguments),
+                    call = typeof method.call === 'function' ? method.call(args) : method.call;
+
+                // get the callback if one is available
+                if(typeof args[args.length-1] === 'function'){
+                    callback = args[args.length-1];
+                    Array.prototype.pop.call(args);
+                }
+
+                // add the defaultBlock if not given
+                if(method.addDefaultblock) {
+                    if(args.length !== method.addDefaultblock)
+                        Array.prototype.push.call(args, (isFinite(c.ETH_DEFAULTBLOCK) ? utils.fromDecimal(c.ETH_DEFAULTBLOCK) : c.ETH_DEFAULTBLOCK));
+                    else
+                        args[args.length-1] = isFinite(args[args.length-1]) ? utils.fromDecimal(args[args.length-1]) : args[args.length-1];
+                }
+
+                // show deprecated warning
+                if(method.newMethod)
+                    console.warn('This method is deprecated please use web3.'+ method.newMethod +'() instead.');
+
+                return web3.manager.send({
+                    method: call,
+                    params: args,
+                    outputFormatter: method.outputFormatter,
+                    inputFormatter: method.inputFormatter,
+                    addDefaultblock: method.addDefaultblock
+                }, callback);
+            };
+
+        if(objectMethods.length > 1) {
+            if(!obj[objectMethods[0]])
+                obj[objectMethods[0]] = {};
+
+            obj[objectMethods[0]][objectMethods[1]] = callFunction;
+        
+        } else {
+
+            obj[objectMethods[0]] = callFunction;
+        }
+
+    });
+};
+
+/// creates properties in a given object based on properties description on input
+/// setups api calls for these properties
+var setupProperties = function (obj, properties) {
+    properties.forEach(function (property) {
+        var objectProperties = property.name.split('.'),
+            proto = {};
+
+        proto.get = function () {
+
+            // show deprecated warning
+            if(property.newProperty)
+                console.warn('This property is deprecated please use web3.'+ property.newProperty +' instead.');
+
+
+            return web3.manager.send({
+                method: property.getter,
+                outputFormatter: property.outputFormatter
+            });
+        };
+
+        if (property.setter) {
+            proto.set = function (val) {
+
+                // show deprecated warning
+                if(property.newProperty)
+                    console.warn('This property is deprecated please use web3.'+ property.newProperty +' instead.');
+
+                return web3.manager.send({
+                    method: property.setter,
+                    params: [val],
+                    inputFormatter: property.inputFormatter
+                });
+            };
+        }
+
+        proto.enumerable = !property.newProperty;
+
+        if(objectProperties.length > 1) {
+            if(!obj[objectProperties[0]])
+                obj[objectProperties[0]] = {};
+
+            Object.defineProperty(obj[objectProperties[0]], objectProperties[1], proto);        
+        } else
+            Object.defineProperty(obj, property.name, proto);
+
+    });
+};
+
+/*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);
+};
+
+var ethWatch = {
+    startPolling: startPolling.bind(null, 'eth_getFilterChanges'), 
+    stopPolling: stopPolling
+};
+
+var shhWatch = {
+    startPolling: startPolling.bind(null, 'shh_getFilterChanges'), 
+    stopPolling: stopPolling
+};
+
+/// setups web3 object, and it's in-browser executed methods
+var web3 = {
+
+    version: {
+        api: version.version
+    },
+
+    manager: requestManager(),
+    providers: {},
+
+    setProvider: function (provider) {
+        web3.manager.setProvider(provider);
+    },
+    
+    /// Should be called to reset state of web3 object
+    /// Resets everything except manager
+    reset: function () {
+        web3.manager.reset(); 
+    },
+
+    /// @returns hex string of the input
+    toHex: utils.toHex,
+
+    /// @returns ascii string representation of hex value prefixed with 0x
+    toAscii: utils.toAscii,
+
+    /// @returns hex representation (prefixed by 0x) of ascii string
+    fromAscii: utils.fromAscii,
+
+    /// @returns decimal representaton of hex value prefixed by 0x
+    toDecimal: utils.toDecimal,
+
+    /// @returns hex representation (prefixed by 0x) of decimal value
+    fromDecimal: utils.fromDecimal,
+
+    /// @returns a BigNumber object
+    toBigNumber: utils.toBigNumber,
+
+    toWei: utils.toWei,
+    fromWei: utils.fromWei,
+    isAddress: utils.isAddress,
+
+    // provide network information
+    net: {
+        // peerCount: 
+    },
+
+
+    /// eth object prototype
+    eth: {
+        // DEPRECATED
+        contractFromAbi: function (abi) {
+            console.warn('Initiating a contract like this is deprecated please use var MyContract = eth.contract(abi); new MyContract(address); instead.');
+
+            return function(addr) {
+                // Default to address of Config. TODO: rremove prior to genesis.
+                addr = addr || '0xc6d9d2cd449a754c494264e1809c50e34d64562b';
+                var ret = web3.eth.contract(addr, abi);
+                ret.address = addr;
+                return ret;
+            };
+        },
+
+        /// @param filter may be a string, object or event
+        /// @param eventParams is optional, this is an object with optional event eventParams params
+        /// @param options is optional, this is an object with optional event options ('max'...)
+        /*jshint maxparams:4 */
+        filter: function (fil, eventParams, options) {
+
+            // if its event, treat it differently
+            if (fil._isEvent)
+                return fil(eventParams, options);
+
+            return filter(fil, ethWatch, formatters.outputLogFormatter);
+        },
+        // DEPRECATED
+        watch: function (fil, eventParams, options) {
+            console.warn('eth.watch() is deprecated please use eth.filter() instead.');
+            return this.filter(fil, eventParams, options);
+        }
+        /*jshint maxparams:3 */
+    },
+
+    /// db object prototype
+    db: {},
+
+    /// shh object prototype
+    shh: {
+        /// @param filter may be a string, object or event
+        filter: function (fil) {
+            return filter(fil, shhWatch, formatters.outputPostFormatter);
+        },
+        // DEPRECATED
+        watch: function (fil) {
+            console.warn('shh.watch() is deprecated please use shh.filter() instead.');
+            return this.filter(fil);
+        }
+    }
+};
+
+
+// ADD defaultblock
+Object.defineProperty(web3.eth, 'defaultBlock', {
+    get: function () {
+        return c.ETH_DEFAULTBLOCK;
+    },
+    set: function (val) {
+        c.ETH_DEFAULTBLOCK = val;
+        return c.ETH_DEFAULTBLOCK;
+    }
+});
+
+
+/// setups all api methods
+setupMethods(web3, web3Methods);
+setupProperties(web3, web3Properties);
+setupMethods(web3.net, net.methods);
+setupProperties(web3.net, net.properties);
+setupMethods(web3.eth, eth.methods);
+setupProperties(web3.eth, eth.properties);
+setupMethods(web3.db, db.methods());
+setupMethods(web3.shh, shh.methods());
+setupMethods(ethWatch, watches.eth());
+setupMethods(shhWatch, watches.shh());
+
+module.exports = web3;
+
+
+},{"../version.json":21,"./solidity/formatters":2,"./utils/config":4,"./utils/utils":5,"./web3/db":8,"./web3/eth":9,"./web3/filter":11,"./web3/net":15,"./web3/requestmanager":17,"./web3/shh":18,"./web3/watches":20}],7:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -283,9 +1388,9 @@ module.exports = {
  * @date 2014
  */
 
-var web3 = require('./web3'); 
-var abi = require('./abi');
-var utils = require('./utils');
+var web3 = require('../web3'); 
+var abi = require('../solidity/abi');
+var utils = require('../utils/utils');
 var eventImpl = require('./event');
 var signature = require('./signature');
 
@@ -301,16 +1406,24 @@ var exportNatspecGlobals = function (vars) {
 var addFunctionRelatedPropertiesToContract = function (contract) {
     
     contract.call = function (options) {
-        contract._isTransact = false;
+        contract._isTransaction = false;
         contract._options = options;
         return contract;
     };
 
-    contract.transact = function (options) {
-        contract._isTransact = true;
+
+    contract.sendTransaction = function (options) {
+        contract._isTransaction = true;
         contract._options = options;
         return contract;
     };
+    // DEPRECATED
+    contract.transact = function (options) {
+
+        console.warn('myContract.transact() is deprecated please use myContract.sendTransaction() instead.');
+
+        return contract.sendTransaction(options);
+    };
 
     contract._options = {};
     ['gas', 'gasPrice', 'value', 'from'].forEach(function(p) {
@@ -342,14 +1455,14 @@ var addFunctionsToContract = function (contract, desc, address) {
             options.to = address;
             options.data = sign + parsed;
             
-            var isTransact = contract._isTransact === true || (contract._isTransact !== false && !method.constant);
+            var isTransaction = contract._isTransaction === true || (contract._isTransaction !== false && !method.constant);
             var collapse = options.collapse !== false;
             
             // reset
             contract._options = {};
-            contract._isTransact = null;
+            contract._isTransaction = null;
 
-            if (isTransact) {
+            if (isTransaction) {
                 
                 exportNatspecGlobals({
                     abi: desc,
@@ -359,7 +1472,7 @@ var addFunctionsToContract = function (contract, desc, address) {
                 });
 
                 // transactions do not have any output, cause we do not know, when they will be processed
-                web3.eth.transact(options);
+                web3.eth.sendTransaction(options);
                 return;
             }
             
@@ -391,7 +1504,7 @@ var addEventRelatedPropertiesToContract = function (contract, desc, address) {
         return parser(data);
     };
     
-    Object.defineProperty(contract, 'topic', {
+    Object.defineProperty(contract, 'topics', {
         get: function() {
             return utils.filterEvents(desc).map(function (e) {
                 return signature.eventSignatureFromAscii(e.name);
@@ -414,7 +1527,7 @@ var addEventsToContract = function (contract, desc, address) {
                 var parser = eventImpl.outputParser(e);
                 return parser(data);
             };
-            return web3.eth.watch(o, undefined, undefined, outputFormatter);
+            return web3.eth.filter(o, undefined, undefined, outputFormatter);
         };
         
         // this property should be used by eth.filter to check if object is an event
@@ -444,24 +1557,40 @@ var addEventsToContract = function (contract, desc, address) {
  *      outputs: [{name: 'd', type: 'string' }]
  * }];  // contract abi
  *
- * var myContract = web3.eth.contract('0x0123123121', abi); // creation of contract object
+ * var MyContract = web3.eth.contract(abi); // creation of contract prototype
  *
- * myContract.myMethod('this is test string param for call'); // myMethod call (implicit, default)
- * myContract.call().myMethod('this is test string param for call'); // myMethod call (explicit)
- * myContract.transact().myMethod('this is test string param for transact'); // myMethod transact
+ * var contractInstance = new MyContract('0x0123123121');
  *
- * @param address - address of the contract, which should be called
- * @param desc - abi json description of the contract, which is being created
+ * contractInstance.myMethod('this is test string param for call'); // myMethod call (implicit, default)
+ * contractInstance.call().myMethod('this is test string param for call'); // myMethod call (explicit)
+ * contractInstance.sendTransaction().myMethod('this is test string param for transact'); // myMethod sendTransaction
+ *
+ * @param abi - abi json description of the contract, which is being created
  * @returns contract object
  */
+var contract = function (abi) {
+
+    // return prototype
+    if(abi instanceof Array && arguments.length === 1) {
+        return Contract.bind(null, abi);
+
+    // deprecated: auto initiate contract
+    } else {
+
+        console.warn('Initiating a contract like this is deprecated please use var MyContract = eth.contract(abi); new MyContract(address); instead.');
+
+        return new Contract(arguments[1], arguments[0]);
+    }
 
-var contract = function (address, desc) {
+};
+
+function Contract(abi, address) {
 
     // workaround for invalid assumption that method.name is the full anonymous prototype of the method.
     // it's not. it's just the name. the rest of the code assumes it's actually the anonymous
     // prototype, so we make it so as a workaround.
     // TODO: we may not want to modify input params, maybe use copy instead?
-    desc.forEach(function (method) {
+    abi.forEach(function (method) {
         if (method.name.indexOf('(') === -1) {
             var displayName = method.name;
             var typeName = method.inputs.map(function(i){return i.type; }).join();
@@ -471,17 +1600,17 @@ var contract = function (address, desc) {
 
     var result = {};
     addFunctionRelatedPropertiesToContract(result);
-    addFunctionsToContract(result, desc, address);
-    addEventRelatedPropertiesToContract(result, desc, address);
-    addEventsToContract(result, desc, address);
+    addFunctionsToContract(result, abi, address);
+    addEventRelatedPropertiesToContract(result, abi, address);
+    addEventsToContract(result, abi, address);
 
     return result;
-};
+}
 
 module.exports = contract;
 
 
-},{"./abi":1,"./event":6,"./signature":14,"./utils":16,"./web3":18}],4:[function(require,module,exports){
+},{"../solidity/abi":1,"../utils/utils":5,"../web3":6,"./event":10,"./signature":19}],8:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -504,13 +1633,14 @@ module.exports = contract;
  * @date 2015
  */
 
+
 /// @returns an array of objects describing web3.db api methods
 var methods = function () {
     return [
-    { name: 'put', call: 'db_put' },
-    { name: 'get', call: 'db_get' },
-    { name: 'putString', call: 'db_putString' },
-    { name: 'getString', call: 'db_getString' }
+    { name: 'putString', call: 'db_putString'},
+    { name: 'getString', call: 'db_getString'},
+    { name: 'putHex', call: 'db_putHex'},
+    { name: 'getHex', call: 'db_getHex'}
     ];
 };
 
@@ -518,7 +1648,7 @@ module.exports = {
     methods: methods
 };
 
-},{}],5:[function(require,module,exports){
+},{}],9:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -538,66 +1668,129 @@ module.exports = {
 /** @file eth.js
  * @authors:
  *   Marek Kotewicz <marek@ethdev.com>
+ *   Fabian Vogelsteller <fabian@ethdev.com>
  * @date 2015
  */
 
-/// @returns an array of objects describing web3.eth api methods
-var methods = function () {
-    var blockCall = function (args) {
-        return typeof args[0] === "string" ? "eth_blockByHash" : "eth_blockByNumber";
-    };
+/**
+ * Web3
+ * 
+ * @module web3
+ */
 
-    var transactionCall = function (args) {
-        return typeof args[0] === "string" ? 'eth_transactionByHash' : 'eth_transactionByNumber';
-    };
+/**
+ * Eth methods and properties
+ *
+ * An example method object can look as follows:
+ *
+ *      {
+ *      name: 'getBlock',
+ *      call: blockCall,
+ *      outputFormatter: formatters.outputBlockFormatter,
+ *      inputFormatter: [ // can be a formatter funciton or an array of functions. Where each item in the array will be used for one parameter
+ *           utils.toHex, // formats paramter 1
+ *           function(param){ if(!param) return false; } // formats paramter 2
+ *         ]
+ *       },
+ *
+ * @class [web3] eth
+ * @constructor
+ */
 
-    var uncleCall = function (args) {
-        return typeof args[0] === "string" ? 'eth_uncleByHash' : 'eth_uncleByNumber';
-    };
 
-    var transactionCountCall = function (args) {
-        return typeof args[0] === "string" ? 'eth_transactionCountByHash' : 'eth_transactionCountByNumber';
-    };
+var formatters = require('./formatters');
+var utils = require('../utils/utils');
 
-    var uncleCountCall = function (args) {
-        return typeof args[0] === "string" ? 'eth_uncleCountByHash' : 'eth_uncleCountByNumber';
-    };
 
-    return [
-    { name: 'balanceAt', call: 'eth_balanceAt' },
-    { name: 'stateAt', call: 'eth_stateAt' },
-    { name: 'storageAt', call: 'eth_storageAt' },
-    { name: 'countAt', call: 'eth_countAt'},
-    { name: 'codeAt', call: 'eth_codeAt' },
-    { name: 'transact', call: 'eth_transact' },
-    { name: 'call', call: 'eth_call' },
-    { name: 'block', call: blockCall },
-    { name: 'transaction', call: transactionCall },
-    { name: 'uncle', call: uncleCall },
-    { name: 'compilers', call: 'eth_compilers' },
-    { name: 'flush', call: 'eth_flush' },
-    { name: 'lll', call: 'eth_lll' },
-    { name: 'solidity', call: 'eth_solidity' },
-    { name: 'serpent', call: 'eth_serpent' },
-    { name: 'logs', call: 'eth_logs' },
-    { name: 'transactionCount', call: transactionCountCall },
-    { name: 'uncleCount', call: uncleCountCall }
-    ];
+var blockCall = function (args) {
+    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? "eth_getBlockByHash" : "eth_getBlockByNumber";
+};
+
+var transactionFromBlockCall = function (args) {
+    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? 'eth_getTransactionByBlockHashAndIndex' : 'eth_getTransactionByBlockNumberAndIndex';
 };
 
+var uncleCall = function (args) {
+    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? 'eth_getUncleByBlockHashAndIndex' : 'eth_getUncleByBlockNumberAndIndex';
+};
+
+var getBlockTransactionCountCall = function (args) {
+    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? 'eth_getBlockTransactionCountByHash' : 'eth_getBlockTransactionCountByNumber';
+};
+
+var uncleCountCall = function (args) {
+    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? 'eth_getUncleCountByBlockHash' : 'eth_getUncleCountByBlockNumber';
+};
+
+/// @returns an array of objects describing web3.eth api methods
+var methods = [
+    { name: 'getBalance', call: 'eth_getBalance', addDefaultblock: 2,
+        outputFormatter: formatters.convertToBigNumber},
+    { name: 'getStorageAt', call: 'eth_getStorageAt', addDefaultblock: 3,
+        inputFormatter: utils.toHex},
+	{ name: 'getCode', call: 'eth_getCode', addDefaultblock: 2},
+    { name: 'getBlock', call: blockCall,
+        outputFormatter: formatters.outputBlockFormatter,
+        inputFormatter: [utils.toHex, function(param){ return (!param) ? false : true; }]},
+    { name: 'getUncle', call: uncleCall,
+        outputFormatter: formatters.outputBlockFormatter,
+        inputFormatter: [utils.toHex, utils.toHex, function(param){ return (!param) ? false : true; }]},
+    { name: 'getCompilers', call: 'eth_getCompilers' },
+    { name: 'getBlockTransactionCount', call: getBlockTransactionCountCall,
+        outputFormatter: utils.toDecimal,
+        inputFormatter: utils.toHex },
+    { name: 'getBlockUncleCount', call: uncleCountCall,
+        outputFormatter: utils.toDecimal,
+        inputFormatter: utils.toHex },
+    { name: 'getTransaction', call: 'eth_getTransactionByHash',
+        outputFormatter: formatters.outputTransactionFormatter },
+    { name: 'getTransactionFromBlock', call: transactionFromBlockCall,
+        outputFormatter: formatters.outputTransactionFormatter,
+        inputFormatter: utils.toHex },
+    { name: 'getTransactionCount', call: 'eth_getTransactionCount', addDefaultblock: 2,
+        outputFormatter: utils.toDecimal},
+    { name: 'sendTransaction', call: 'eth_sendTransaction',
+        inputFormatter: formatters.inputTransactionFormatter },
+    { name: 'call', call: 'eth_call', addDefaultblock: 2,
+        inputFormatter: formatters.inputCallFormatter },
+    { name: 'compile.solidity', call: 'eth_compileSolidity' },
+    { name: 'compile.lll', call: 'eth_compileLLL', inputFormatter: utils.toHex },
+    { name: 'compile.serpent', call: 'eth_compileSerpent', inputFormatter: utils.toHex },
+    { name: 'flush', call: 'eth_flush' },
+
+    // deprecated methods
+    { name: 'balanceAt', call: 'eth_balanceAt', newMethod: 'eth.getBalance' },
+    { name: 'stateAt', call: 'eth_stateAt', newMethod: 'eth.getStorageAt' },
+    { name: 'storageAt', call: 'eth_storageAt', newMethod: 'eth.getStorage' },
+    { name: 'countAt', call: 'eth_countAt', newMethod: 'eth.getTransactionCount' },
+	{ name: 'codeAt', call: 'eth_codeAt', newMethod: 'eth.getCode' },
+    { name: 'transact', call: 'eth_transact', newMethod: 'eth.sendTransaction' },
+    { name: 'block', call: blockCall, newMethod: 'eth.getBlock' },
+    { name: 'transaction', call: transactionFromBlockCall, newMethod: 'eth.getTransaction' },
+    { name: 'uncle', call: uncleCall, newMethod: 'eth.getUncle' },
+    { name: 'compilers', call: 'eth_compilers', newMethod: 'eth.getCompilers' },
+    { name: 'solidity', call: 'eth_solidity', newMethod: 'eth.compile.solidity' },
+    { name: 'lll', call: 'eth_lll', newMethod: 'eth.compile.lll' },
+    { name: 'serpent', call: 'eth_serpent', newMethod: 'eth.compile.serpent' },
+    { name: 'transactionCount', call: getBlockTransactionCountCall, newMethod: 'eth.getBlockTransactionCount' },
+    { name: 'uncleCount', call: uncleCountCall, newMethod: 'eth.getBlockUncleCount' },
+    { name: 'logs', call: 'eth_logs' }
+];
+
 /// @returns an array of objects describing web3.eth api properties
-var properties = function () {
-    return [
-    { name: 'coinbase', getter: 'eth_coinbase', setter: 'eth_setCoinbase' },
-    { name: 'listening', getter: 'eth_listening', setter: 'eth_setListening' },
-    { name: 'mining', getter: 'eth_mining', setter: 'eth_setMining' },
-    { name: 'gasPrice', getter: 'eth_gasPrice' },
+var properties = [
+    { name: 'coinbase', getter: 'eth_coinbase'},
+    { name: 'mining', getter: 'eth_mining'},
+    { name: 'gasPrice', getter: 'eth_gasPrice', outputFormatter: formatters.convertToBigNumber},
     { name: 'accounts', getter: 'eth_accounts' },
-    { name: 'peerCount', getter: 'eth_peerCount' },
-    { name: 'defaultBlock', getter: 'eth_defaultBlock', setter: 'eth_setDefaultBlock' },
-    { name: 'number', getter: 'eth_number'}
-    ];
-};
+    { name: 'blockNumber', getter: 'eth_blockNumber', outputFormatter: utils.toDecimal},
+
+    // deprecated properties
+    { name: 'listening', getter: 'net_listening', setter: 'eth_setListening', newProperty: 'net.listening'},
+    { name: 'peerCount', getter: 'net_peerCount', newProperty: 'net.peerCount'},
+    { name: 'number', getter: 'eth_number', newProperty: 'eth.blockNumber'}
+];
+
 
 module.exports = {
     methods: methods,
@@ -605,7 +1798,7 @@ module.exports = {
 };
 
 
-},{}],6:[function(require,module,exports){
+},{"../utils/utils":5,"./formatters":12}],10:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -628,8 +1821,8 @@ module.exports = {
  * @date 2014
  */
 
-var abi = require('./abi');
-var utils = require('./utils');
+var abi = require('../solidity/abi');
+var utils = require('../utils/utils');
 var signature = require('./signature');
 
 /// filter inputs array && returns only indexed (or not) inputs
@@ -671,14 +1864,14 @@ var indexedParamsToTopics = function (event, indexed) {
 
 var inputParser = function (address, sign, event) {
     
-    // valid options are 'earliest', 'latest', 'offset' and 'max', as defined for 'eth.watch'
+    // valid options are 'earliest', 'latest', 'offset' and 'max', as defined for 'eth.filter'
     return function (indexed, options) {
         var o = options || {};
         o.address = address;
-        o.topic = [];
-        o.topic.push(sign);
+        o.topics = [];
+        o.topics.push(sign);
         if (indexed) {
-            o.topic = o.topic.concat(indexedParamsToTopics(event, indexed));
+            o.topics = o.topics.concat(indexedParamsToTopics(event, indexed));
         }
         return o;
     };
@@ -710,12 +1903,12 @@ var outputParser = function (event) {
         };
 
         output.topics = output.topic; // fallback for go-ethereum
-        if (!output.topic) {
+        if (!output.topics) {
             return result;
         }
        
         var indexedOutputs = filterInputs(event.inputs, true);
-        var indexedData = "0x" + output.topic.slice(1, output.topic.length).map(function (topic) { return topic.slice(2); }).join("");
+        var indexedData = "0x" + output.topics.slice(1, output.topics.length).map(function (topics) { return topics.slice(2); }).join("");
         var indexedRes = abi.formatOutput(indexedOutputs, indexedData);
 
         var notIndexedOutputs = filterInputs(event.inputs, false);
@@ -730,7 +1923,7 @@ var outputParser = function (event) {
 var getMatchingEvent = function (events, payload) {
     for (var i = 0; i < events.length; i++) {
         var sign = signature.eventSignatureFromAscii(events[i].name); 
-        if (sign === payload.topic[0]) {
+        if (sign === payload.topics[0]) {
             return events[i];
         }
     }
@@ -745,7 +1938,7 @@ module.exports = {
 };
 
 
-},{"./abi":1,"./signature":14,"./utils":16}],7:[function(require,module,exports){
+},{"../solidity/abi":1,"../utils/utils":5,"./signature":19}],11:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -767,16 +1960,19 @@ module.exports = {
  *   Jeffrey Wilcke <jeff@ethdev.com>
  *   Marek Kotewicz <marek@ethdev.com>
  *   Marian Oancea <marian@ethdev.com>
+ *   Fabian Vogelsteller <fabian@ethdev.com>
  *   Gav Wood <g@ethdev.com>
  * @date 2014
  */
 
+var utils = require('../utils/utils');
+
 /// Should be called to check if filter implementation is valid
 /// @returns true if it is, otherwise false
 var implementationIsValid = function (i) {
     return !!i && 
         typeof i.newFilter === 'function' && 
-        typeof i.getMessages === 'function' && 
+        typeof i.getLogs === 'function' && 
         typeof i.uninstallFilter === 'function' &&
         typeof i.startPolling === 'function' &&
         typeof i.stopPolling === 'function';
@@ -786,25 +1982,56 @@ var implementationIsValid = function (i) {
 /// @param should be string or object
 /// @returns options string or object
 var getOptions = function (options) {
+    /*jshint maxcomplexity:9 */
+
     if (typeof options === 'string') {
         return options;
     } 
 
     options = options || {};
 
-    if (options.topics) {
-        console.warn('"topics" is deprecated, is "topic" instead');
+    if (options.topic) {
+        console.warn('"topic" is deprecated, is "topics" instead');
+        options.topics = options.topic;
+    }
+
+    if (options.earliest) {
+        console.warn('"earliest" is deprecated, is "fromBlock" instead');
+        options.fromBlock = options.earliest;
+    }
+
+    if (options.latest) {
+        console.warn('"latest" is deprecated, is "toBlock" instead');
+        options.toBlock = options.latest;
     }
 
+    if (options.skip) {
+        console.warn('"skip" is deprecated, is "offset" instead');
+        options.offset = options.skip;
+    }
+
+    if (options.max) {
+        console.warn('"max" is deprecated, is "limit" instead');
+        options.limit = options.max;
+    }
+
+    // make sure topics, get converted to hex
+    if(options.topics instanceof Array) {
+        options.topics = options.topics.map(function(topic){
+            return utils.toHex(topic);
+        });
+    }
+
+
     // evaluate lazy properties
     return {
+        fromBlock: utils.toHex(options.fromBlock),
+        toBlock: utils.toHex(options.toBlock),
+        limit: utils.toHex(options.limit),
+        offset: utils.toHex(options.offset),
         to: options.to,
-        topic: options.topic,
-        earliest: options.earliest,
-        latest: options.latest,
-        max: options.max,
-        skip: options.skip,
-        address: options.address
+        address: options.address,
+        topics: options.topics
     };
 };
 
@@ -822,6 +2049,8 @@ var filter = function(options, implementation, formatter) {
     options = getOptions(options);
     var callbacks = [];
     var filterId = implementation.newFilter(options);
+
+    // call the callbacks
     var onMessages = function (messages) {
         messages.forEach(function (message) {
             message = formatter ? formatter(message) : message;
@@ -833,34 +2062,61 @@ var filter = function(options, implementation, formatter) {
 
     implementation.startPolling(filterId, onMessages, implementation.uninstallFilter);
 
-    var changed = function (callback) {
+    var watch = function(callback) {
         callbacks.push(callback);
     };
 
-    var messages = function () {
-        return implementation.getMessages(filterId);
-    };
-    
-    var uninstall = function () {
+    var stopWatching = function() {
         implementation.stopPolling(filterId);
         implementation.uninstallFilter(filterId);
         callbacks = [];
     };
 
+    var get = function () {
+        var results = implementation.getLogs(filterId);
+
+        return utils.isArray(results) ? results.map(function(message){
+                return formatter ? formatter(message) : message;
+            }) : results;
+    };
+    
     return {
-        changed: changed,
-        arrived: changed,
-        happened: changed,
-        messages: messages,
-        logs: messages,
-        uninstall: uninstall
+        watch: watch,
+        stopWatching: stopWatching,
+        get: get,
+
+        // DEPRECATED methods
+        changed:  function(){
+            console.warn('watch().changed() is deprecated please use filter().watch() instead.');
+            return watch.apply(this, arguments);
+        },
+        arrived:  function(){
+            console.warn('watch().arrived() is deprecated please use filter().watch() instead.');
+            return watch.apply(this, arguments);
+        },
+        happened:  function(){
+            console.warn('watch().happened() is deprecated please use filter().watch() instead.');
+            return watch.apply(this, arguments);
+        },
+        uninstall: function(){
+            console.warn('watch().uninstall() is deprecated please use filter().stopWatching() instead.');
+            return stopWatching.apply(this, arguments);
+        },
+        messages: function(){
+            console.warn('watch().messages() is deprecated please use filter().get() instead.');
+            return get.apply(this, arguments);
+        },
+        logs: function(){
+            console.warn('watch().logs() is deprecated please use filter().get() instead.');
+            return get.apply(this, arguments);
+        }
     };
 };
 
 module.exports = filter;
 
 
-},{}],8:[function(require,module,exports){
+},{"../utils/utils":5}],12:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -880,144 +2136,192 @@ module.exports = filter;
 /** @file formatters.js
  * @authors:
  *   Marek Kotewicz <marek@ethdev.com>
+ *   Fabian Vogelsteller <fabian@ethdev.com>
  * @date 2015
  */
 
-if ("build" !== 'build') {/*
-    var BigNumber = require('bignumber.js'); // jshint ignore:line
-*/}
+var utils = require('../utils/utils');
+
+/**
+ * Should the input to a big number
+ *
+ * @method convertToBigNumber
+ * @param {String|Number|BigNumber}
+ * @returns {BigNumber} object
+ */
+var convertToBigNumber = function (value) {
+    return utils.toBigNumber(value);
+};
+
+/**
+ * Formats the input of a transaction and converts all values to HEX
+ *
+ * @method inputTransactionFormatter
+ * @param {Object} transaction options
+ * @returns object
+*/
+var inputTransactionFormatter = function (options){
 
-var utils = require('./utils');
-var c = require('./const');
+    // make code -> data
+    if (options.code) {
+        options.data = options.code;
+        delete options.code;
+    }
+
+    ['gasPrice', 'gas', 'value'].forEach(function(key){
+        options[key] = utils.fromDecimal(options[key]);
+    });
+
+    return options;
+};
+
+/**
+ * Formats the output of a transaction to its proper values
+ * 
+ * @method outputTransactionFormatter
+ * @param {Object} transaction
+ * @returns {Object} transaction
+*/
+var outputTransactionFormatter = function (tx){
+    tx.gas = utils.toDecimal(tx.gas);
+    tx.gasPrice = utils.toBigNumber(tx.gasPrice);
+    tx.value = utils.toBigNumber(tx.value);
+    return tx;
+};
+
+/**
+ * Formats the input of a call and converts all values to HEX
+ *
+ * @method inputCallFormatter
+ * @param {Object} transaction options
+ * @returns object
+*/
+var inputCallFormatter = function (options){
+
+    // make code -> data
+    if (options.code) {
+        options.data = options.code;
+        delete options.code;
+    }
 
-/// @param string string to be padded
-/// @param number of characters that result string should have
-/// @param sign, by default 0
-/// @returns right aligned string
-var padLeft = function (string, chars, sign) {
-    return new Array(chars - string.length + 1).join(sign ? sign : "0") + string;
+    return options;
 };
 
-/// Formats input value to byte representation of int
-/// If value is negative, return it's two's complement
-/// 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')
-            value = new BigNumber(value);
-        BigNumber.config(c.ETH_BIGNUMBER_ROUNDING_MODE);
-        value = value.round();
-
-        if (value.lessThan(0)) 
-            value = new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).plus(value).plus(1);
-        value = value.toString(16);
+
+/**
+ * Formats the output of a block to its proper values
+ *
+ * @method outputBlockFormatter
+ * @param {Object} block object 
+ * @returns {Object} block object
+*/
+var outputBlockFormatter = function(block){
+
+    // transform to number
+    block.gasLimit = utils.toDecimal(block.gasLimit);
+    block.gasUsed = utils.toDecimal(block.gasUsed);
+    block.size = utils.toDecimal(block.size);
+    block.timestamp = utils.toDecimal(block.timestamp);
+    block.number = utils.toDecimal(block.number);
+
+    block.minGasPrice = utils.toBigNumber(block.minGasPrice);
+    block.difficulty = utils.toBigNumber(block.difficulty);
+    block.totalDifficulty = utils.toBigNumber(block.totalDifficulty);
+
+    if(block.transactions instanceof Array) {
+        block.transactions.forEach(function(item){
+            if(!utils.isString(item))
+                return outputTransactionFormatter(item);
+        });
     }
-    else if (value.indexOf('0x') === 0)
-        value = value.substr(2);
-    else if (typeof value === 'string')
-        value = formatInputInt(new BigNumber(value));
-    else
-        value = (+value).toString(16);
-    return padLeft(value, padding);
-};
 
-/// Formats input value to byte representation of string
-/// @returns left-algined byte representation of string
-var formatInputString = function (value) {
-    return utils.fromAscii(value, c.ETH_PADDING).substr(2);
+    return block;
 };
 
-/// Formats input value to byte representation of bool
-/// @returns right-aligned byte representation bool
-var formatInputBool = function (value) {
-    return '000000000000000000000000000000000000000000000000000000000000000' + (value ?  '1' : '0');
-};
+/**
+ * Formats the output of a log
+ * 
+ * @method outputLogFormatter
+ * @param {Object} log object
+ * @returns {Object} log
+*/
+var outputLogFormatter = function(log){
+    log.blockNumber = utils.toDecimal(log.blockNumber);
+    log.transactionIndex = utils.toDecimal(log.transactionIndex);
+    log.logIndex = utils.toDecimal(log.logIndex);
 
-/// Formats input value to byte representation of real
-/// Values are multiplied by 2^m and encoded as integers
-/// @returns byte representation of real
-var formatInputReal = function (value) {
-    return formatInputInt(new BigNumber(value).times(new BigNumber(2).pow(128))); 
+    return log;
 };
 
 
-/// Check if input value is negative
-/// @param value is hex format
-/// @returns true if it is negative, otherwise false
-var signedIsNegative = function (value) {
-    return (new BigNumber(value.substr(0, 1), 16).toString(2).substr(0, 1)) === '1';
-};
+/**
+ * Formats the input of a whisper post and converts all values to HEX
+ *
+ * @method inputPostFormatter
+ * @param {Object} transaction object
+ * @returns {Object}
+*/
+var inputPostFormatter = function(post){
 
-/// Formats input right-aligned input bytes to int
-/// @returns right-aligned input bytes formatted to int
-var formatOutputInt = function (value) {
-    value = value || "0";
-    // check if it's negative number
-    // it it is, return two's complement
-    if (signedIsNegative(value)) {
-        return new BigNumber(value, 16).minus(new BigNumber('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', 16)).minus(1);
-    }
-    return new BigNumber(value, 16);
-};
+    post.payload = utils.toHex(post.payload);
+    post.ttl = utils.fromDecimal(post.ttl);
+    post.priority = utils.fromDecimal(post.priority);
 
-/// Formats big right-aligned input bytes to uint
-/// @returns right-aligned input bytes formatted to uint
-var formatOutputUInt = function (value) {
-    value = value || "0";
-    return new BigNumber(value, 16);
-};
+    if(!(post.topics instanceof Array))
+        post.topics = [post.topics];
 
-/// @returns input bytes formatted to real
-var formatOutputReal = function (value) {
-    return formatOutputInt(value).dividedBy(new BigNumber(2).pow(128)); 
-};
 
-/// @returns input bytes formatted to ureal
-var formatOutputUReal = function (value) {
-    return formatOutputUInt(value).dividedBy(new BigNumber(2).pow(128)); 
-};
+    // format the following options
+    post.topics = post.topics.map(function(topic){
+        return utils.fromAscii(topic);
+    });
 
-/// @returns right-aligned input bytes formatted to hex
-var formatOutputHash = function (value) {
-    return "0x" + value;
+    return post;
 };
 
-/// @returns right-aligned input bytes formatted to bool
-var formatOutputBool = function (value) {
-    return value === '0000000000000000000000000000000000000000000000000000000000000001' ? true : false;
-};
+/**
+ * Formats the output of a received post message
+ *
+ * @method outputPostFormatter
+ * @param {Object}
+ * @returns {Object}
+ */
+var outputPostFormatter = function(post){
+
+    post.expiry = utils.toDecimal(post.expiry);
+    post.sent = utils.toDecimal(post.sent);
+    post.ttl = utils.toDecimal(post.ttl);
+    post.workProved = utils.toDecimal(post.workProved);
+    post.payloadRaw = post.payload;
+    post.payload = utils.toAscii(post.payload);
+
+    if(post.payload.indexOf('{') === 0 || post.payload.indexOf('[') === 0) {
+        try {
+            post.payload = JSON.parse(post.payload);
+        } catch (e) { }
+    }
 
-/// @returns left-aligned input bytes formatted to ascii string
-var formatOutputString = function (value) {
-    return utils.toAscii(value);
-};
+    // format the following options
+    post.topics = post.topics.map(function(topic){
+        return utils.toAscii(topic);
+    });
 
-/// @returns right-aligned input bytes formatted to address
-var formatOutputAddress = function (value) {
-    return "0x" + value.slice(value.length - 40, value.length);
+    return post;
 };
 
-
 module.exports = {
-    formatInputInt: formatInputInt,
-    formatInputString: formatInputString,
-    formatInputBool: formatInputBool,
-    formatInputReal: formatInputReal,
-    formatOutputInt: formatOutputInt,
-    formatOutputUInt: formatOutputUInt,
-    formatOutputReal: formatOutputReal,
-    formatOutputUReal: formatOutputUReal,
-    formatOutputHash: formatOutputHash,
-    formatOutputBool: formatOutputBool,
-    formatOutputString: formatOutputString,
-    formatOutputAddress: formatOutputAddress
+    convertToBigNumber: convertToBigNumber,
+    inputTransactionFormatter: inputTransactionFormatter,
+    outputTransactionFormatter: outputTransactionFormatter,
+    inputCallFormatter: inputCallFormatter,
+    outputBlockFormatter: outputBlockFormatter,
+    outputLogFormatter: outputLogFormatter,
+    inputPostFormatter: inputPostFormatter,
+    outputPostFormatter: outputPostFormatter
 };
 
 
-},{"./const":2,"./utils":16}],9:[function(require,module,exports){
+},{"../utils/utils":5}],13:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -1034,10 +2338,11 @@ module.exports = {
     You should have received a copy of the GNU Lesser General Public License
     along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-/** @file httpsync.js
+/** @file httpprovider.js
  * @authors:
  *   Marek Kotewicz <marek@ethdev.com>
  *   Marian Oancea <marian@ethdev.com>
+ *   Fabian Vogelsteller <fabian@ethdev.com>
  * @date 2014
  */
 
@@ -1045,29 +2350,49 @@ if ("build" !== 'build') {/*
         var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line
 */}
 
-var HttpSyncProvider = function (host) {
+var HttpProvider = function (host) {
+    this.name  = 'HTTP';
     this.handlers = [];
-    this.host = host || 'http://127.0.0.1:8080';
+    this.host = host || 'http://localhost:8080';
 };
 
-HttpSyncProvider.prototype.send = function (payload) {
-    //var data = formatJsonRpcObject(payload);
-
+HttpProvider.prototype.send = function (payload, callback) {
     var request = new XMLHttpRequest();
-    request.open('POST', this.host, false);
-    request.send(JSON.stringify(payload));
 
-    var result = request.responseText;
-    // check request.status
-    if(request.status !== 200)
-        return;
-    return JSON.parse(result);
+    // ASYNC
+    if(typeof callback === 'function') {
+        request.onreadystatechange = function() {
+            if(request.readyState === 4) {
+                var result = '';
+                try {
+                    result = JSON.parse(request.responseText);
+                } catch(error) {
+                    result = error;
+                }
+                callback(result, request.status);
+            }
+        };
+
+        request.open('POST', this.host, true);
+        request.send(JSON.stringify(payload));
+
+    // SYNC
+    } else {
+        request.open('POST', this.host, false);
+        request.send(JSON.stringify(payload));
+
+        // check request.status
+        if(request.status !== 200)
+            return;
+        return JSON.parse(request.responseText);
+        
+    }
 };
 
-module.exports = HttpSyncProvider;
+module.exports = HttpProvider;
 
 
-},{}],10:[function(require,module,exports){
+},{}],14:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -1134,7 +2459,50 @@ module.exports = {
 
 
 
-},{}],11:[function(require,module,exports){
+},{}],15:[function(require,module,exports){
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js 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 Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file eth.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ * @date 2015
+ */
+
+var utils = require('../utils/utils');
+
+/// @returns an array of objects describing web3.eth api methods
+var methods = [
+    // { name: 'getBalance', call: 'eth_balanceAt', outputFormatter: formatters.convertToBigNumber},
+];
+
+/// @returns an array of objects describing web3.eth api properties
+var properties = [
+    { name: 'listening', getter: 'net_listening'},
+    { name: 'peerCount', getter: 'net_peerCount', outputFormatter: utils.toDecimal },
+];
+
+
+module.exports = {
+    methods: methods,
+    properties: properties
+};
+
+
+},{"../utils/utils":5}],16:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -1169,7 +2537,7 @@ QtSyncProvider.prototype.send = function (payload) {
 module.exports = QtSyncProvider;
 
 
-},{}],12:[function(require,module,exports){
+},{}],17:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -1191,12 +2559,13 @@ module.exports = QtSyncProvider;
  *   Jeffrey Wilcke <jeff@ethdev.com>
  *   Marek Kotewicz <marek@ethdev.com>
  *   Marian Oancea <marian@ethdev.com>
+ *   Fabian Vogelsteller <fabian@ethdev.com>
  *   Gav Wood <g@ethdev.com>
  * @date 2014
  */
 
 var jsonrpc = require('./jsonrpc');
-var c = require('./const');
+var c = require('../utils/config');
 
 /**
  * It's responsible for passing messages to providers
@@ -1208,7 +2577,25 @@ var requestManager = function() {
     var timeout = null;
     var provider;
 
-    var send = function (data) {
+    var send = function (data, callback) {
+        /*jshint maxcomplexity: 8 */
+
+        // FORMAT BASED ON ONE FORMATTER function
+        if(typeof data.inputFormatter === 'function') {
+            data.params = Array.prototype.map.call(data.params, function(item, index){
+                // format everything besides the defaultblock, which is already formated
+                return (!data.addDefaultblock || index+1 < data.addDefaultblock) ? data.inputFormatter(item) : item;
+            });
+
+        // FORMAT BASED ON the input FORMATTER ARRAY
+        } else if(data.inputFormatter instanceof Array) {
+            data.params = Array.prototype.map.call(data.inputFormatter, function(formatter, index){
+                // format everything besides the defaultblock, which is already formated
+                return (!data.addDefaultblock || index+1 < data.addDefaultblock) ? formatter(data.params[index]) : data.params[index];
+            });
+        }
+
+
         var payload = jsonrpc.toPayload(data.method, data.params);
         
         if (!provider) {
@@ -1216,14 +2603,42 @@ var requestManager = function() {
             return null;
         }
 
-        var result = provider.send(payload);
+        // HTTP ASYNC (only when callback is given, and it a HttpProvidor)
+        if(typeof callback === 'function' && provider.name === 'HTTP'){
+            provider.send(payload, function(result, status){
+
+                if (!jsonrpc.isValidResponse(result)) {
+                    if(typeof result === 'object' && result.error && result.error.message) {
+                        console.error(result.error.message);
+                        callback(result.error);
+                    } else {
+                        callback(new Error({
+                            status: status,
+                            error: result,
+                            message: 'Bad Request'
+                        }));
+                    }
+                    return null;
+                }
+
+                // format the output
+                callback(null, (typeof data.outputFormatter === 'function') ? data.outputFormatter(result.result) : result.result);
+            });
 
-        if (!jsonrpc.isValidResponse(result)) {
-            console.log(result);
-            return null;
+        // SYNC
+        } else {
+            var result = provider.send(payload);
+
+            if (!jsonrpc.isValidResponse(result)) {
+                if(typeof result === 'object' && result.error && result.error.message)
+                    console.error(result.error.message);
+                return null;
+            }
+
+            // format the output
+            return (typeof data.outputFormatter === 'function') ? data.outputFormatter(result.result) : result.result;
         }
         
-        return result.result;
     };
 
     var setProvider = function (p) {
@@ -1260,11 +2675,13 @@ var requestManager = function() {
 
     var poll = function () {
         polls.forEach(function (data) {
-            var result = send(data.data);
-            if (!(result instanceof Array) || result.length === 0) {
-                return;
-            }
-            data.callback(result);
+            // send async
+            send(data.data, function(error, result){
+                if (!(result instanceof Array) || result.length === 0) {
+                    return;
+                }
+                data.callback(result);
+            });
         });
         timeout = setTimeout(poll, c.ETH_POLLING_TIMEOUT);
     };
@@ -1283,7 +2700,7 @@ var requestManager = function() {
 module.exports = requestManager;
 
 
-},{"./const":2,"./jsonrpc":10}],13:[function(require,module,exports){
+},{"../utils/config":4,"./jsonrpc":14}],18:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -1306,148 +2723,28 @@ module.exports = requestManager;
  * @date 2015
  */
 
+var formatters = require('./formatters');
+
 /// @returns an array of objects describing web3.shh api methods
 var methods = function () {
-    return [
-    { name: 'post', call: 'shh_post' },
-    { name: 'newIdentity', call: 'shh_newIdentity' },
-    { name: 'haveIdentity', call: 'shh_haveIdentity' },
-    { name: 'newGroup', call: 'shh_newGroup' },
-    { name: 'addToGroup', call: 'shh_addToGroup' }
-    ];
-};
-
-module.exports = {
-    methods: methods
-};
-
-
-},{}],14:[function(require,module,exports){
-/*
-    This file is part of ethereum.js.
-
-    ethereum.js is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ethereum.js 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 Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file signature.js
- * @authors:
- *   Marek Kotewicz <marek@ethdev.com>
- * @date 2015
- */
-
-var web3 = require('./web3'); 
-var c = require('./const');
-
-/// @param function name for which we want to get signature
-/// @returns signature of function with given name
-var functionSignatureFromAscii = function (name) {
-    return web3.sha3(web3.fromAscii(name)).slice(0, 2 + c.ETH_SIGNATURE_LENGTH * 2);
-};
-
-/// @param event name for which we want to get signature
-/// @returns signature of event with given name
-var eventSignatureFromAscii = function (name) {
-    return web3.sha3(web3.fromAscii(name));
-};
-
-module.exports = {
-    functionSignatureFromAscii: functionSignatureFromAscii,
-    eventSignatureFromAscii: eventSignatureFromAscii
-};
-
-
-},{"./const":2,"./web3":18}],15:[function(require,module,exports){
-/*
-    This file is part of ethereum.js.
-
-    ethereum.js is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ethereum.js 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 Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file types.js
- * @authors:
- *   Marek Kotewicz <marek@ethdev.com>
- * @date 2015
- */
-
-var f = require('./formatters');
-
-/// @param expected type prefix (string)
-/// @returns function which checks if type has matching prefix. if yes, returns true, otherwise false
-var prefixedType = function (prefix) {
-    return function (type) {
-        return type.indexOf(prefix) === 0;
-    };
-};
-
-/// @param expected type name (string)
-/// @returns function which checks if type is matching expected one. if yes, returns true, otherwise false
-var namedType = function (name) {
-    return function (type) {
-        return name === type;
-    };
-};
-
-/// Setups input formatters for solidity types
-/// @returns an array of input formatters 
-var inputTypes = function () {
-    
-    return [
-        { type: prefixedType('uint'), format: f.formatInputInt },
-        { type: prefixedType('int'), format: f.formatInputInt },
-        { type: prefixedType('hash'), format: f.formatInputInt },
-        { type: prefixedType('string'), format: f.formatInputString }, 
-        { type: prefixedType('real'), format: f.formatInputReal },
-        { type: prefixedType('ureal'), format: f.formatInputReal },
-        { type: namedType('address'), format: f.formatInputInt },
-        { type: namedType('bool'), format: f.formatInputBool }
-    ];
-};
-
-/// Setups output formaters for solidity types
-/// @returns an array of output formatters
-var outputTypes = function () {
-
-    return [
-        { type: prefixedType('uint'), format: f.formatOutputUInt },
-        { type: prefixedType('int'), format: f.formatOutputInt },
-        { type: prefixedType('hash'), format: f.formatOutputHash },
-        { type: prefixedType('string'), format: f.formatOutputString },
-        { type: prefixedType('real'), format: f.formatOutputReal },
-        { type: prefixedType('ureal'), format: f.formatOutputUReal },
-        { type: namedType('address'), format: f.formatOutputAddress },
-        { type: namedType('bool'), format: f.formatOutputBool }
+    return [
+    { name: 'post', call: 'shh_post', inputFormatter: formatters.inputPostFormatter },
+    { name: 'newIdentity', call: 'shh_newIdentity' },
+    { name: 'hasIdentity', call: 'shh_hasIdentity' },
+    { name: 'newGroup', call: 'shh_newGroup' },
+    { name: 'addToGroup', call: 'shh_addToGroup' },
+
+    // deprecated
+    { name: 'haveIdentity', call: 'shh_haveIdentity', newMethod: 'shh.hasIdentity' },
     ];
 };
 
 module.exports = {
-    prefixedType: prefixedType,
-    namedType: namedType,
-    inputTypes: inputTypes,
-    outputTypes: outputTypes
+    methods: methods
 };
 
 
-},{"./formatters":8}],16:[function(require,module,exports){
+},{"./formatters":12}],19:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -1464,135 +2761,34 @@ module.exports = {
     You should have received a copy of the GNU Lesser General Public License
     along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-/** @file utils.js
+/** @file signature.js
  * @authors:
  *   Marek Kotewicz <marek@ethdev.com>
  * @date 2015
  */
 
-var c = require('./const');
-
-/// Finds first index of array element matching pattern
-/// @param array
-/// @param callback pattern
-/// @returns index of element
-var findIndex = function (array, callback) {
-    var end = false;
-    var i = 0;
-    for (; i < array.length && !end; i++) {
-        end = callback(array[i]);
-    }
-    return end ? i - 1 : -1;
-};
-
-/// @returns ascii string representation of hex value prefixed with 0x
-var toAscii = function(hex) {
-// Find termination
-    var str = "";
-    var i = 0, l = hex.length;
-    if (hex.substring(0, 2) === '0x') {
-        i = 2;
-    }
-    for (; i < l; i+=2) {
-        var code = parseInt(hex.substr(i, 2), 16);
-        if (code === 0) {
-            break;
-        }
-
-        str += String.fromCharCode(code);
-    }
-
-    return str;
-};
-    
-var toHex = function(str) {
-    var hex = "";
-    for(var i = 0; i < str.length; i++) {
-        var n = str.charCodeAt(i).toString(16);
-        hex += n.length < 2 ? '0' + n : n;
-    }
-
-    return hex;
-};
-
-/// @returns hex representation (prefixed by 0x) of ascii string
-var fromAscii = function(str, pad) {
-    pad = pad === undefined ? 0 : pad;
-    var hex = toHex(str);
-    while (hex.length < pad*2)
-        hex += "00";
-    return "0x" + hex;
-};
-
-/// @returns display name for function/event eg. multiply(uint256) -> multiply
-var extractDisplayName = function (name) {
-    var length = name.indexOf('('); 
-    return length !== -1 ? name.substr(0, length) : name;
-};
-
-/// @returns overloaded part of function/event name
-var extractTypeName = function (name) {
-    /// TODO: make it invulnerable
-    var length = name.indexOf('(');
-    return length !== -1 ? name.substr(length + 1, name.length - 1 - (length + 1)).replace(' ', '') : "";
-};
-
-/// Filters all function from input abi
-/// @returns abi array with filtered objects of type 'function'
-var filterFunctions = function (json) {
-    return json.filter(function (current) {
-        return current.type === 'function'; 
-    }); 
-};
+var web3 = require('../web3'); 
+var c = require('../utils/config');
 
-/// Filters all events form input abi
-/// @returns abi array with filtered objects of type 'event'
-var filterEvents = function (json) {
-    return json.filter(function (current) {
-        return current.type === 'event';
-    });
+/// @param function name for which we want to get signature
+/// @returns signature of function with given name
+var functionSignatureFromAscii = function (name) {
+    return web3.sha3(web3.fromAscii(name)).slice(0, 2 + c.ETH_SIGNATURE_LENGTH * 2);
 };
 
-/// used to transform value/string to eth string
-/// 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;
-    while (val > 3000 && unit < units.length - 1)
-    {
-        val /= 1000;
-        unit++;
-    }
-    var s = val.toString().length < val.toFixed(2).length ? val.toString() : val.toFixed(2);
-    var replaceFunction = function($0, $1, $2) {
-        return $1 + ',' + $2;
-    };
-
-    while (true) {
-        var o = s;
-        s = s.replace(/(\d)(\d\d\d[\.\,])/, replaceFunction);
-        if (o === s)
-            break;
-    }
-    return s + ' ' + units[unit];
+/// @param event name for which we want to get signature
+/// @returns signature of event with given name
+var eventSignatureFromAscii = function (name) {
+    return web3.sha3(web3.fromAscii(name));
 };
 
 module.exports = {
-    findIndex: findIndex,
-    toAscii: toAscii,
-    fromAscii: fromAscii,
-    extractDisplayName: extractDisplayName,
-    extractTypeName: extractTypeName,
-    filterFunctions: filterFunctions,
-    filterEvents: filterEvents,
-    toEth: toEth
+    functionSignatureFromAscii: functionSignatureFromAscii,
+    eventSignatureFromAscii: eventSignatureFromAscii
 };
 
 
-},{"./const":2}],17:[function(require,module,exports){
+},{"../utils/config":4,"../web3":6}],20:[function(require,module,exports){
 /*
     This file is part of ethereum.js.
 
@@ -1615,16 +2811,16 @@ module.exports = {
  * @date 2015
  */
 
-/// @returns an array of objects describing web3.eth.watch api methods
+/// @returns an array of objects describing web3.eth.filter api methods
 var eth = function () {
     var newFilter = function (args) {
-        return typeof args[0] === 'string' ? 'eth_newFilterString' : 'eth_newFilter';
+        return typeof args[0] === 'string' ? 'eth_newBlockFilter' : 'eth_newFilter';
     };
 
     return [
     { name: 'newFilter', call: newFilter },
     { name: 'uninstallFilter', call: 'eth_uninstallFilter' },
-    { name: 'getMessages', call: 'eth_filterLogs' }
+    { name: 'getLogs', call: 'eth_getFilterLogs' }
     ];
 };
 
@@ -1633,7 +2829,7 @@ var shh = function () {
     return [
     { name: 'newFilter', call: 'shh_newFilter' },
     { name: 'uninstallFilter', call: 'shh_uninstallFilter' },
-    { name: 'getMessages', call: 'shh_getMessages' }
+    { name: 'getLogs', call: 'shh_getMessages' }
     ];
 };
 
@@ -1643,215 +2839,20 @@ module.exports = {
 };
 
 
-},{}],18:[function(require,module,exports){
-/*
-    This file is part of ethereum.js.
-
-    ethereum.js is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ethereum.js 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 Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file web3.js
- * @authors:
- *   Jeffrey Wilcke <jeff@ethdev.com>
- *   Marek Kotewicz <marek@ethdev.com>
- *   Marian Oancea <marian@ethdev.com>
- *   Gav Wood <g@ethdev.com>
- * @date 2014
- */
-
-if ("build" !== 'build') {/*
-    var BigNumber = require('bignumber.js');
-*/}
-
-var eth = require('./eth');
-var db = require('./db');
-var shh = require('./shh');
-var watches = require('./watches');
-var filter = require('./filter');
-var utils = require('./utils');
-var requestManager = require('./requestmanager');
-
-/// @returns an array of objects describing web3 api methods
-var web3Methods = function () {
-    return [
-    { name: 'sha3', call: 'web3_sha3' }
-    ];
-};
-
-/// creates methods in a given object based on method description on input
-/// setups api calls for these methods
-var setupMethods = function (obj, methods) {
-    methods.forEach(function (method) {
-        obj[method.name] = function () {
-            var args = Array.prototype.slice.call(arguments);
-            var call = typeof method.call === 'function' ? method.call(args) : method.call;
-            return web3.manager.send({
-                method: call,
-                params: args
-            });
-        };
-    });
-};
-
-/// creates properties in a given object based on properties description on input
-/// setups api calls for these properties
-var setupProperties = function (obj, properties) {
-    properties.forEach(function (property) {
-        var proto = {};
-        proto.get = function () {
-            return web3.manager.send({
-                method: property.getter
-            });
-        };
-
-        if (property.setter) {
-            proto.set = function (val) {
-                return web3.manager.send({
-                    method: property.setter,
-                    params: [val]
-                });
-            };
-        }
-        Object.defineProperty(obj, property.name, proto);
-    });
-};
-
-/*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);
-};
-
-var ethWatch = {
-    startPolling: startPolling.bind(null, 'eth_changed'), 
-    stopPolling: stopPolling
-};
-
-var shhWatch = {
-    startPolling: startPolling.bind(null, 'shh_changed'), 
-    stopPolling: stopPolling
-};
-
-/// setups web3 object, and it's in-browser executed methods
-var web3 = {
-    manager: requestManager(),
-    providers: {},
-
-    /// @returns ascii string representation of hex value prefixed with 0x
-    toAscii: utils.toAscii,
-
-    /// @returns hex representation (prefixed by 0x) of ascii string
-    fromAscii: utils.fromAscii,
-
-    /// @returns decimal representaton of hex value prefixed by 0x
-    toDecimal: function (val) {
-        // remove 0x and place 0, if it's required
-        val = val.length > 2 ? val.substring(2) : "0";
-        return (new BigNumber(val, 16).toString(10));
-    },
-
-    /// @returns hex representation (prefixed by 0x) of decimal value
-    fromDecimal: function (val) {
-        return "0x" + (new BigNumber(val).toString(16));
-    },
-
-    /// used to transform value/string to eth string
-    toEth: utils.toEth,
-
-    /// eth object prototype
-    eth: {
-        contractFromAbi: function (abi) {
-            return function(addr) {
-                // Default to address of Config. TODO: rremove prior to genesis.
-                addr = addr || '0xc6d9d2cd449a754c494264e1809c50e34d64562b';
-                var ret = web3.eth.contract(addr, abi);
-                ret.address = addr;
-                return ret;
-            };
-        },
-
-        canary: function (abi) {
-            return function(addr) {
-                // Default to address of Config. TODO: rremove prior to genesis.
-                addr = addr || '0xc6d9d2cd449a754c494264e1809c50e34d64562b';
-                return addr;
-            };
-        },
-
-        /// @param filter may be a string, object or event
-        /// @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
-    db: {},
-
-    /// shh object prototype
-    shh: {
-        /// @param filter may be a string, object or event
-        watch: function (fil) {
-            return filter(fil, shhWatch);
-        }
-    },
-    setProvider: function (provider) {
-        web3.manager.setProvider(provider);
-    },
-    
-    /// Should be called to reset state of web3 object
-    /// Resets everything except manager
-    reset: function () {
-        web3.manager.reset(); 
-    }
-};
-
-/// setups all api methods
-setupMethods(web3, web3Methods());
-setupMethods(web3.eth, eth.methods());
-setupProperties(web3.eth, eth.properties());
-setupMethods(web3.db, db.methods());
-setupMethods(web3.shh, shh.methods());
-setupMethods(ethWatch, watches.eth());
-setupMethods(shhWatch, watches.shh());
-
-module.exports = web3;
-
-
-},{"./db":4,"./eth":5,"./filter":7,"./requestmanager":12,"./shh":13,"./utils":16,"./watches":17}],"web3":[function(require,module,exports){
+},{}],21:[function(require,module,exports){
+module.exports={
+    "version": "0.1.3"
+}
+},{}],"web3":[function(require,module,exports){
 var web3 = require('./lib/web3');
-web3.providers.HttpSyncProvider = require('./lib/httpsync');
-web3.providers.QtSyncProvider = require('./lib/qtsync');
-web3.eth.contract = require('./lib/contract');
-web3.abi = require('./lib/abi');
+web3.providers.HttpProvider = require('./lib/web3/httpprovider');
+web3.providers.QtSyncProvider = require('./lib/web3/qtsync');
+web3.eth.contract = require('./lib/web3/contract');
+web3.abi = require('./lib/solidity/abi');
 
 module.exports = web3;
 
-},{"./lib/abi":1,"./lib/contract":3,"./lib/httpsync":9,"./lib/qtsync":11,"./lib/web3":18}]},{},["web3"])
+},{"./lib/solidity/abi":1,"./lib/web3":6,"./lib/web3/contract":7,"./lib/web3/httpprovider":13,"./lib/web3/qtsync":16}]},{},["web3"])
 
 
-//# sourceMappingURL=ethereum.js.map
\ No newline at end of file
+//# sourceMappingURL=ethereum.js.map
diff --git a/libjsqrc/ethereumjs/dist/ethereum.js.map b/libjsqrc/ethereumjs/dist/ethereum.js.map
index 2b788900e..a36e9ed17 100644
--- a/libjsqrc/ethereumjs/dist/ethereum.js.map
+++ b/libjsqrc/ethereumjs/dist/ethereum.js.map
@@ -2,50 +2,56 @@
   "version": 3,
   "sources": [
     "node_modules/browserify/node_modules/browser-pack/_prelude.js",
-    "lib/abi.js",
-    "lib/const.js",
-    "lib/contract.js",
-    "lib/db.js",
-    "lib/eth.js",
-    "lib/event.js",
-    "lib/filter.js",
-    "lib/formatters.js",
-    "lib/httpsync.js",
-    "lib/jsonrpc.js",
-    "lib/qtsync.js",
-    "lib/requestmanager.js",
-    "lib/shh.js",
-    "lib/signature.js",
-    "lib/types.js",
-    "lib/utils.js",
-    "lib/watches.js",
+    "lib/solidity/abi.js",
+    "lib/solidity/formatters.js",
+    "lib/solidity/types.js",
+    "lib/utils/config.js",
+    "lib/utils/utils.js",
     "lib/web3.js",
+    "lib/web3/contract.js",
+    "lib/web3/db.js",
+    "lib/web3/eth.js",
+    "lib/web3/event.js",
+    "lib/web3/filter.js",
+    "lib/web3/formatters.js",
+    "lib/web3/httpprovider.js",
+    "lib/web3/jsonrpc.js",
+    "lib/web3/net.js",
+    "lib/web3/qtsync.js",
+    "lib/web3/requestmanager.js",
+    "lib/web3/shh.js",
+    "lib/web3/signature.js",
+    "lib/web3/watches.js",
+    "version.json",
     "index.js"
   ],
   "names": [],
-  "mappings": "AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3NA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1IA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjHA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3JA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChHA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/IA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA",
+  "mappings": "AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrPA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtNA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChcA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5SA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnPA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrJA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1IA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChLA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3MA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjDA;AACA;AACA;;ACFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA",
   "file": "generated.js",
   "sourceRoot": "",
   "sourcesContent": [
     "(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file abi.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n *   Gav Wood <g@ethdev.com>\n * @date 2014\n */\n\nvar utils = require('./utils');\nvar types = require('./types');\nvar c = require('./const');\nvar f = require('./formatters');\n\nvar displayTypeError = function (type) {\n    console.error('parser does not support type: ' + type);\n};\n\n/// This method should be called if we want to check if givent type is an array type\n/// @returns true if it is, otherwise false\nvar arrayType = function (type) {\n    return type.slice(-2) === '[]';\n};\n\nvar dynamicTypeBytes = function (type, value) {\n    // TODO: decide what to do with array of strings\n    if (arrayType(type) || type === 'string')    // only string itself that is dynamic; stringX is static length.\n        return f.formatInputInt(value.length);\n    return \"\";\n};\n\nvar inputTypes = types.inputTypes();\n\n/// Formats input params to bytes\n/// @param abi contract method inputs\n/// @param array of params that will be formatted to bytes\n/// @returns bytes representation of input params\nvar formatInput = function (inputs, params) {\n    var bytes = \"\";\n    var toAppendConstant = \"\";\n    var toAppendArrayContent = \"\";\n\n    /// first we iterate in search for dynamic\n    inputs.forEach(function (input, index) {\n        bytes += dynamicTypeBytes(input.type, params[index]);\n    });\n\n    inputs.forEach(function (input, i) {\n        /*jshint maxcomplexity:5 */\n        var typeMatch = false;\n        for (var j = 0; j < inputTypes.length && !typeMatch; j++) {\n            typeMatch = inputTypes[j].type(inputs[i].type, params[i]);\n        }\n        if (!typeMatch) {\n            displayTypeError(inputs[i].type);\n        }\n\n        var formatter = inputTypes[j - 1].format;\n\n        if (arrayType(inputs[i].type))\n            toAppendArrayContent += params[i].reduce(function (acc, curr) {\n                return acc + formatter(curr);\n            }, \"\");\n        else if (inputs[i].type === 'string')\n            toAppendArrayContent += formatter(params[i]);\n        else\n            toAppendConstant += formatter(params[i]);\n    });\n\n    bytes += toAppendConstant + toAppendArrayContent;\n\n    return bytes;\n};\n\nvar dynamicBytesLength = function (type) {\n    if (arrayType(type) || type === 'string')   // only string itself that is dynamic; stringX is static length.\n        return c.ETH_PADDING * 2;\n    return 0;\n};\n\nvar outputTypes = types.outputTypes();\n\n/// Formats output bytes back to param list\n/// @param contract abi method outputs\n/// @param bytes representtion of output\n/// @returns array of output params\nvar formatOutput = function (outs, output) {\n\n    output = output.slice(2);\n    var result = [];\n    var padding = c.ETH_PADDING * 2;\n\n    var dynamicPartLength = outs.reduce(function (acc, curr) {\n        return acc + dynamicBytesLength(curr.type);\n    }, 0);\n\n    var dynamicPart = output.slice(0, dynamicPartLength);\n    output = output.slice(dynamicPartLength);\n\n    outs.forEach(function (out, i) {\n        /*jshint maxcomplexity:6 */\n        var typeMatch = false;\n        for (var j = 0; j < outputTypes.length && !typeMatch; j++) {\n            typeMatch = outputTypes[j].type(outs[i].type);\n        }\n\n        if (!typeMatch) {\n            displayTypeError(outs[i].type);\n        }\n\n        var formatter = outputTypes[j - 1].format;\n        if (arrayType(outs[i].type)) {\n            var size = f.formatOutputUInt(dynamicPart.slice(0, padding));\n            dynamicPart = dynamicPart.slice(padding);\n            var array = [];\n            for (var k = 0; k < size; k++) {\n                array.push(formatter(output.slice(0, padding)));\n                output = output.slice(padding);\n            }\n            result.push(array);\n        }\n        else if (types.prefixedType('string')(outs[i].type)) {\n            dynamicPart = dynamicPart.slice(padding);\n            result.push(formatter(output.slice(0, padding)));\n            output = output.slice(padding);\n        } else {\n            result.push(formatter(output.slice(0, padding)));\n            output = output.slice(padding);\n        }\n    });\n\n    return result;\n};\n\n/// @param json abi for contract\n/// @returns input parser object for given json abi\n/// TODO: refactor creating the parser, do not double logic from contract\nvar inputParser = function (json) {\n    var parser = {};\n    json.forEach(function (method) {\n        var displayName = utils.extractDisplayName(method.name);\n        var typeName = utils.extractTypeName(method.name);\n\n        var impl = function () {\n            var params = Array.prototype.slice.call(arguments);\n            return formatInput(method.inputs, params);\n        };\n\n        if (parser[displayName] === undefined) {\n            parser[displayName] = impl;\n        }\n\n        parser[displayName][typeName] = impl;\n    });\n\n    return parser;\n};\n\n/// @param json abi for contract\n/// @returns output parser for given json abi\nvar outputParser = function (json) {\n    var parser = {};\n    json.forEach(function (method) {\n\n        var displayName = utils.extractDisplayName(method.name);\n        var typeName = utils.extractTypeName(method.name);\n\n        var impl = function (output) {\n            return formatOutput(method.outputs, output);\n        };\n\n        if (parser[displayName] === undefined) {\n            parser[displayName] = impl;\n        }\n\n        parser[displayName][typeName] = impl;\n    });\n\n    return parser;\n};\n\nmodule.exports = {\n    inputParser: inputParser,\n    outputParser: outputParser,\n    formatInput: formatInput,\n    formatOutput: formatOutput\n};\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file const.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\n/// required to define ETH_BIGNUMBER_ROUNDING_MODE\nif (\"build\" !== 'build') {/*\n    var BigNumber = require('bignumber.js'); // jshint ignore:line\n*/}\n\nvar ETH_UNITS = [ \n    'wei', \n    'Kwei', \n    'Mwei', \n    'Gwei', \n    'szabo', \n    'finney', \n    'ether', \n    'grand', \n    'Mether', \n    'Gether', \n    'Tether', \n    'Pether', \n    'Eether', \n    'Zether', \n    'Yether', \n    'Nether', \n    'Dether', \n    'Vether', \n    'Uether' \n];\n\nmodule.exports = {\n    ETH_PADDING: 32,\n    ETH_SIGNATURE_LENGTH: 4,\n    ETH_UNITS: ETH_UNITS,\n    ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN },\n    ETH_POLLING_TIMEOUT: 1000\n};\n\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file contract.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2014\n */\n\nvar web3 = require('./web3'); \nvar abi = require('./abi');\nvar utils = require('./utils');\nvar eventImpl = require('./event');\nvar signature = require('./signature');\n\nvar exportNatspecGlobals = function (vars) {\n    // it's used byt natspec.js\n    // TODO: figure out better way to solve this\n    web3._currentContractAbi = vars.abi;\n    web3._currentContractAddress = vars.address;\n    web3._currentContractMethodName = vars.method;\n    web3._currentContractMethodParams = vars.params;\n};\n\nvar addFunctionRelatedPropertiesToContract = function (contract) {\n    \n    contract.call = function (options) {\n        contract._isTransact = false;\n        contract._options = options;\n        return contract;\n    };\n\n    contract.transact = function (options) {\n        contract._isTransact = true;\n        contract._options = options;\n        return contract;\n    };\n\n    contract._options = {};\n    ['gas', 'gasPrice', 'value', 'from'].forEach(function(p) {\n        contract[p] = function (v) {\n            contract._options[p] = v;\n            return contract;\n        };\n    });\n\n};\n\nvar addFunctionsToContract = function (contract, desc, address) {\n    var inputParser = abi.inputParser(desc);\n    var outputParser = abi.outputParser(desc);\n\n    // create contract functions\n    utils.filterFunctions(desc).forEach(function (method) {\n\n        var displayName = utils.extractDisplayName(method.name);\n        var typeName = utils.extractTypeName(method.name);\n\n        var impl = function () {\n            /*jshint maxcomplexity:7 */\n            var params = Array.prototype.slice.call(arguments);\n            var sign = signature.functionSignatureFromAscii(method.name);\n            var parsed = inputParser[displayName][typeName].apply(null, params);\n\n            var options = contract._options || {};\n            options.to = address;\n            options.data = sign + parsed;\n            \n            var isTransact = contract._isTransact === true || (contract._isTransact !== false && !method.constant);\n            var collapse = options.collapse !== false;\n            \n            // reset\n            contract._options = {};\n            contract._isTransact = null;\n\n            if (isTransact) {\n                \n                exportNatspecGlobals({\n                    abi: desc,\n                    address: address,\n                    method: method.name,\n                    params: params\n                });\n\n                // transactions do not have any output, cause we do not know, when they will be processed\n                web3.eth.transact(options);\n                return;\n            }\n            \n            var output = web3.eth.call(options);\n            var ret = outputParser[displayName][typeName](output);\n            if (collapse)\n            {\n                if (ret.length === 1)\n                    ret = ret[0];\n                else if (ret.length === 0)\n                    ret = null;\n            }\n            return ret;\n        };\n\n        if (contract[displayName] === undefined) {\n            contract[displayName] = impl;\n        }\n\n        contract[displayName][typeName] = impl;\n    });\n};\n\nvar addEventRelatedPropertiesToContract = function (contract, desc, address) {\n    contract.address = address;\n    contract._onWatchEventResult = function (data) {\n        var matchingEvent = event.getMatchingEvent(utils.filterEvents(desc));\n        var parser = eventImpl.outputParser(matchingEvent);\n        return parser(data);\n    };\n    \n    Object.defineProperty(contract, 'topic', {\n        get: function() {\n            return utils.filterEvents(desc).map(function (e) {\n                return signature.eventSignatureFromAscii(e.name);\n            });\n        }\n    });\n\n};\n\nvar addEventsToContract = function (contract, desc, address) {\n    // create contract events\n    utils.filterEvents(desc).forEach(function (e) {\n\n        var impl = function () {\n            var params = Array.prototype.slice.call(arguments);\n            var sign = signature.eventSignatureFromAscii(e.name);\n            var event = eventImpl.inputParser(address, sign, e);\n            var o = event.apply(null, params);\n            var outputFormatter = function (data) {\n                var parser = eventImpl.outputParser(e);\n                return parser(data);\n            };\n            return web3.eth.watch(o, undefined, undefined, outputFormatter);\n        };\n        \n        // this property should be used by eth.filter to check if object is an event\n        impl._isEvent = true;\n\n        var displayName = utils.extractDisplayName(e.name);\n        var typeName = utils.extractTypeName(e.name);\n\n        if (contract[displayName] === undefined) {\n            contract[displayName] = impl;\n        }\n\n        contract[displayName][typeName] = impl;\n\n    });\n};\n\n\n/**\n * This method should be called when we want to call / transact some solidity method from javascript\n * it returns an object which has same methods available as solidity contract description\n * usage example: \n *\n * var abi = [{\n *      name: 'myMethod',\n *      inputs: [{ name: 'a', type: 'string' }],\n *      outputs: [{name: 'd', type: 'string' }]\n * }];  // contract abi\n *\n * var myContract = web3.eth.contract('0x0123123121', abi); // creation of contract object\n *\n * myContract.myMethod('this is test string param for call'); // myMethod call (implicit, default)\n * myContract.call().myMethod('this is test string param for call'); // myMethod call (explicit)\n * myContract.transact().myMethod('this is test string param for transact'); // myMethod transact\n *\n * @param address - address of the contract, which should be called\n * @param desc - abi json description of the contract, which is being created\n * @returns contract object\n */\n\nvar contract = function (address, desc) {\n\n    // workaround for invalid assumption that method.name is the full anonymous prototype of the method.\n    // it's not. it's just the name. the rest of the code assumes it's actually the anonymous\n    // prototype, so we make it so as a workaround.\n    // TODO: we may not want to modify input params, maybe use copy instead?\n    desc.forEach(function (method) {\n        if (method.name.indexOf('(') === -1) {\n            var displayName = method.name;\n            var typeName = method.inputs.map(function(i){return i.type; }).join();\n            method.name = displayName + '(' + typeName + ')';\n        }\n    });\n\n    var result = {};\n    addFunctionRelatedPropertiesToContract(result);\n    addFunctionsToContract(result, desc, address);\n    addEventRelatedPropertiesToContract(result, desc, address);\n    addEventsToContract(result, desc, address);\n\n    return result;\n};\n\nmodule.exports = contract;\n\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file db.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\n/// @returns an array of objects describing web3.db api methods\nvar methods = function () {\n    return [\n    { name: 'put', call: 'db_put' },\n    { name: 'get', call: 'db_get' },\n    { name: 'putString', call: 'db_putString' },\n    { name: 'getString', call: 'db_getString' }\n    ];\n};\n\nmodule.exports = {\n    methods: methods\n};\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file eth.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\n/// @returns an array of objects describing web3.eth api methods\nvar methods = function () {\n    var blockCall = function (args) {\n        return typeof args[0] === \"string\" ? \"eth_blockByHash\" : \"eth_blockByNumber\";\n    };\n\n    var transactionCall = function (args) {\n        return typeof args[0] === \"string\" ? 'eth_transactionByHash' : 'eth_transactionByNumber';\n    };\n\n    var uncleCall = function (args) {\n        return typeof args[0] === \"string\" ? 'eth_uncleByHash' : 'eth_uncleByNumber';\n    };\n\n    var transactionCountCall = function (args) {\n        return typeof args[0] === \"string\" ? 'eth_transactionCountByHash' : 'eth_transactionCountByNumber';\n    };\n\n    var uncleCountCall = function (args) {\n        return typeof args[0] === \"string\" ? 'eth_uncleCountByHash' : 'eth_uncleCountByNumber';\n    };\n\n    return [\n    { name: 'balanceAt', call: 'eth_balanceAt' },\n    { name: 'stateAt', call: 'eth_stateAt' },\n    { name: 'storageAt', call: 'eth_storageAt' },\n    { name: 'countAt', call: 'eth_countAt'},\n    { name: 'codeAt', call: 'eth_codeAt' },\n    { name: 'transact', call: 'eth_transact' },\n    { name: 'call', call: 'eth_call' },\n    { name: 'block', call: blockCall },\n    { name: 'transaction', call: transactionCall },\n    { name: 'uncle', call: uncleCall },\n    { name: 'compilers', call: 'eth_compilers' },\n    { name: 'flush', call: 'eth_flush' },\n    { name: 'lll', call: 'eth_lll' },\n    { name: 'solidity', call: 'eth_solidity' },\n    { name: 'serpent', call: 'eth_serpent' },\n    { name: 'logs', call: 'eth_logs' },\n    { name: 'transactionCount', call: transactionCountCall },\n    { name: 'uncleCount', call: uncleCountCall }\n    ];\n};\n\n/// @returns an array of objects describing web3.eth api properties\nvar properties = function () {\n    return [\n    { name: 'coinbase', getter: 'eth_coinbase', setter: 'eth_setCoinbase' },\n    { name: 'listening', getter: 'eth_listening', setter: 'eth_setListening' },\n    { name: 'mining', getter: 'eth_mining', setter: 'eth_setMining' },\n    { name: 'gasPrice', getter: 'eth_gasPrice' },\n    { name: 'accounts', getter: 'eth_accounts' },\n    { name: 'peerCount', getter: 'eth_peerCount' },\n    { name: 'defaultBlock', getter: 'eth_defaultBlock', setter: 'eth_setDefaultBlock' },\n    { name: 'number', getter: 'eth_number'}\n    ];\n};\n\nmodule.exports = {\n    methods: methods,\n    properties: properties\n};\n\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file event.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2014\n */\n\nvar abi = require('./abi');\nvar utils = require('./utils');\nvar signature = require('./signature');\n\n/// filter inputs array && returns only indexed (or not) inputs\n/// @param inputs array\n/// @param bool if result should be an array of indexed params on not\n/// @returns array of (not?) indexed params\nvar filterInputs = function (inputs, indexed) {\n    return inputs.filter(function (current) {\n        return current.indexed === indexed;\n    });\n};\n\nvar inputWithName = function (inputs, name) {\n    var index = utils.findIndex(inputs, function (input) {\n        return input.name === name;\n    });\n    \n    if (index === -1) {\n        console.error('indexed param with name ' + name + ' not found');\n        return undefined;\n    }\n    return inputs[index];\n};\n\nvar indexedParamsToTopics = function (event, indexed) {\n    // sort keys?\n    return Object.keys(indexed).map(function (key) {\n        var inputs = [inputWithName(filterInputs(event.inputs, true), key)];\n\n        var value = indexed[key];\n        if (value instanceof Array) {\n            return value.map(function (v) {\n                return abi.formatInput(inputs, [v]);\n            }); \n        }\n        return abi.formatInput(inputs, [value]);\n    });\n};\n\nvar inputParser = function (address, sign, event) {\n    \n    // valid options are 'earliest', 'latest', 'offset' and 'max', as defined for 'eth.watch'\n    return function (indexed, options) {\n        var o = options || {};\n        o.address = address;\n        o.topic = [];\n        o.topic.push(sign);\n        if (indexed) {\n            o.topic = o.topic.concat(indexedParamsToTopics(event, indexed));\n        }\n        return o;\n    };\n};\n\nvar getArgumentsObject = function (inputs, indexed, notIndexed) {\n    var indexedCopy = indexed.slice();\n    var notIndexedCopy = notIndexed.slice();\n    return inputs.reduce(function (acc, current) {\n        var value;\n        if (current.indexed)\n            value = indexedCopy.splice(0, 1)[0];\n        else\n            value = notIndexedCopy.splice(0, 1)[0];\n\n        acc[current.name] = value;\n        return acc;\n    }, {}); \n};\n \nvar outputParser = function (event) {\n    \n    return function (output) {\n        var result = {\n            event: utils.extractDisplayName(event.name),\n            number: output.number,\n            hash: output.hash,\n            args: {}\n        };\n\n        output.topics = output.topic; // fallback for go-ethereum\n        if (!output.topic) {\n            return result;\n        }\n       \n        var indexedOutputs = filterInputs(event.inputs, true);\n        var indexedData = \"0x\" + output.topic.slice(1, output.topic.length).map(function (topic) { return topic.slice(2); }).join(\"\");\n        var indexedRes = abi.formatOutput(indexedOutputs, indexedData);\n\n        var notIndexedOutputs = filterInputs(event.inputs, false);\n        var notIndexedRes = abi.formatOutput(notIndexedOutputs, output.data);\n\n        result.args = getArgumentsObject(event.inputs, indexedRes, notIndexedRes);\n\n        return result;\n    };\n};\n\nvar getMatchingEvent = function (events, payload) {\n    for (var i = 0; i < events.length; i++) {\n        var sign = signature.eventSignatureFromAscii(events[i].name); \n        if (sign === payload.topic[0]) {\n            return events[i];\n        }\n    }\n    return undefined;\n};\n\n\nmodule.exports = {\n    inputParser: inputParser,\n    outputParser: outputParser,\n    getMatchingEvent: getMatchingEvent\n};\n\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file filter.js\n * @authors:\n *   Jeffrey Wilcke <jeff@ethdev.com>\n *   Marek Kotewicz <marek@ethdev.com>\n *   Marian Oancea <marian@ethdev.com>\n *   Gav Wood <g@ethdev.com>\n * @date 2014\n */\n\n/// Should be called to check if filter implementation is valid\n/// @returns true if it is, otherwise false\nvar implementationIsValid = function (i) {\n    return !!i && \n        typeof i.newFilter === 'function' && \n        typeof i.getMessages === 'function' && \n        typeof i.uninstallFilter === 'function' &&\n        typeof i.startPolling === 'function' &&\n        typeof i.stopPolling === 'function';\n};\n\n/// This method should be called on options object, to verify deprecated properties && lazy load dynamic ones\n/// @param should be string or object\n/// @returns options string or object\nvar getOptions = function (options) {\n    if (typeof options === 'string') {\n        return options;\n    } \n\n    options = options || {};\n\n    if (options.topics) {\n        console.warn('\"topics\" is deprecated, is \"topic\" instead');\n    }\n\n    // evaluate lazy properties\n    return {\n        to: options.to,\n        topic: options.topic,\n        earliest: options.earliest,\n        latest: options.latest,\n        max: options.max,\n        skip: options.skip,\n        address: options.address\n    };\n};\n\n/// Should be used when we want to watch something\n/// it's using inner polling mechanism and is notified about changes\n/// @param options are filter options\n/// @param implementation, an abstract polling implementation\n/// @param formatter (optional), callback function which formats output before 'real' callback \nvar filter = function(options, implementation, formatter) {\n    if (!implementationIsValid(implementation)) {\n        console.error('filter implemenation is invalid');\n        return;\n    }\n\n    options = getOptions(options);\n    var callbacks = [];\n    var filterId = implementation.newFilter(options);\n    var onMessages = function (messages) {\n        messages.forEach(function (message) {\n            message = formatter ? formatter(message) : message;\n            callbacks.forEach(function (callback) {\n                callback(message);\n            });\n        });\n    };\n\n    implementation.startPolling(filterId, onMessages, implementation.uninstallFilter);\n\n    var changed = function (callback) {\n        callbacks.push(callback);\n    };\n\n    var messages = function () {\n        return implementation.getMessages(filterId);\n    };\n    \n    var uninstall = function () {\n        implementation.stopPolling(filterId);\n        implementation.uninstallFilter(filterId);\n        callbacks = [];\n    };\n\n    return {\n        changed: changed,\n        arrived: changed,\n        happened: changed,\n        messages: messages,\n        logs: messages,\n        uninstall: uninstall\n    };\n};\n\nmodule.exports = filter;\n\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file formatters.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\nif (\"build\" !== 'build') {/*\n    var BigNumber = require('bignumber.js'); // jshint ignore:line\n*/}\n\nvar utils = require('./utils');\nvar c = require('./const');\n\n/// @param string string to be padded\n/// @param number of characters that result string should have\n/// @param sign, by default 0\n/// @returns right aligned string\nvar padLeft = function (string, chars, sign) {\n    return new Array(chars - string.length + 1).join(sign ? sign : \"0\") + string;\n};\n\n/// Formats input value to byte representation of int\n/// If value is negative, return it's two's complement\n/// If the value is floating point, round it down\n/// @returns right-aligned byte representation of int\nvar formatInputInt = function (value) {\n    /*jshint maxcomplexity:7 */\n    var padding = c.ETH_PADDING * 2;\n    if (value instanceof BigNumber || typeof value === 'number') {\n        if (typeof value === 'number')\n            value = new BigNumber(value);\n        BigNumber.config(c.ETH_BIGNUMBER_ROUNDING_MODE);\n        value = value.round();\n\n        if (value.lessThan(0)) \n            value = new BigNumber(\"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\", 16).plus(value).plus(1);\n        value = value.toString(16);\n    }\n    else if (value.indexOf('0x') === 0)\n        value = value.substr(2);\n    else if (typeof value === 'string')\n        value = formatInputInt(new BigNumber(value));\n    else\n        value = (+value).toString(16);\n    return padLeft(value, padding);\n};\n\n/// Formats input value to byte representation of string\n/// @returns left-algined byte representation of string\nvar formatInputString = function (value) {\n    return utils.fromAscii(value, c.ETH_PADDING).substr(2);\n};\n\n/// Formats input value to byte representation of bool\n/// @returns right-aligned byte representation bool\nvar formatInputBool = function (value) {\n    return '000000000000000000000000000000000000000000000000000000000000000' + (value ?  '1' : '0');\n};\n\n/// Formats input value to byte representation of real\n/// Values are multiplied by 2^m and encoded as integers\n/// @returns byte representation of real\nvar formatInputReal = function (value) {\n    return formatInputInt(new BigNumber(value).times(new BigNumber(2).pow(128))); \n};\n\n\n/// Check if input value is negative\n/// @param value is hex format\n/// @returns true if it is negative, otherwise false\nvar signedIsNegative = function (value) {\n    return (new BigNumber(value.substr(0, 1), 16).toString(2).substr(0, 1)) === '1';\n};\n\n/// Formats input right-aligned input bytes to int\n/// @returns right-aligned input bytes formatted to int\nvar formatOutputInt = function (value) {\n    value = value || \"0\";\n    // check if it's negative number\n    // it it is, return two's complement\n    if (signedIsNegative(value)) {\n        return new BigNumber(value, 16).minus(new BigNumber('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', 16)).minus(1);\n    }\n    return new BigNumber(value, 16);\n};\n\n/// Formats big right-aligned input bytes to uint\n/// @returns right-aligned input bytes formatted to uint\nvar formatOutputUInt = function (value) {\n    value = value || \"0\";\n    return new BigNumber(value, 16);\n};\n\n/// @returns input bytes formatted to real\nvar formatOutputReal = function (value) {\n    return formatOutputInt(value).dividedBy(new BigNumber(2).pow(128)); \n};\n\n/// @returns input bytes formatted to ureal\nvar formatOutputUReal = function (value) {\n    return formatOutputUInt(value).dividedBy(new BigNumber(2).pow(128)); \n};\n\n/// @returns right-aligned input bytes formatted to hex\nvar formatOutputHash = function (value) {\n    return \"0x\" + value;\n};\n\n/// @returns right-aligned input bytes formatted to bool\nvar formatOutputBool = function (value) {\n    return value === '0000000000000000000000000000000000000000000000000000000000000001' ? true : false;\n};\n\n/// @returns left-aligned input bytes formatted to ascii string\nvar formatOutputString = function (value) {\n    return utils.toAscii(value);\n};\n\n/// @returns right-aligned input bytes formatted to address\nvar formatOutputAddress = function (value) {\n    return \"0x\" + value.slice(value.length - 40, value.length);\n};\n\n\nmodule.exports = {\n    formatInputInt: formatInputInt,\n    formatInputString: formatInputString,\n    formatInputBool: formatInputBool,\n    formatInputReal: formatInputReal,\n    formatOutputInt: formatOutputInt,\n    formatOutputUInt: formatOutputUInt,\n    formatOutputReal: formatOutputReal,\n    formatOutputUReal: formatOutputUReal,\n    formatOutputHash: formatOutputHash,\n    formatOutputBool: formatOutputBool,\n    formatOutputString: formatOutputString,\n    formatOutputAddress: formatOutputAddress\n};\n\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file httpsync.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n *   Marian Oancea <marian@ethdev.com>\n * @date 2014\n */\n\nif (\"build\" !== 'build') {/*\n        var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line\n*/}\n\nvar HttpSyncProvider = function (host) {\n    this.handlers = [];\n    this.host = host || 'http://127.0.0.1:8080';\n};\n\nHttpSyncProvider.prototype.send = function (payload) {\n    //var data = formatJsonRpcObject(payload);\n\n    var request = new XMLHttpRequest();\n    request.open('POST', this.host, false);\n    request.send(JSON.stringify(payload));\n\n    var result = request.responseText;\n    // check request.status\n    if(request.status !== 200)\n        return;\n    return JSON.parse(result);\n};\n\nmodule.exports = HttpSyncProvider;\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file abi.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n *   Gav Wood <g@ethdev.com>\n * @date 2014\n */\n\nvar utils = require('../utils/utils');\nvar c = require('../utils/config');\nvar types = require('./types');\nvar f = require('./formatters');\n\n/**\n * throw incorrect type error\n *\n * @method throwTypeError\n * @param {String} type\n * @throws incorrect type error\n */\nvar throwTypeError = function (type) {\n    throw new Error('parser does not support type: ' + type);\n};\n\n/** This method should be called if we want to check if givent type is an array type\n *\n * @method isArrayType\n * @param {String} type name\n * @returns {Boolean} true if it is, otherwise false\n */\nvar isArrayType = function (type) {\n    return type.slice(-2) === '[]';\n};\n\n/**\n * This method should be called to return dynamic type length in hex\n *\n * @method dynamicTypeBytes\n * @param {String} type\n * @param {String|Array} dynamic type\n * @return {String} length of dynamic type in hex or empty string if type is not dynamic\n */\nvar dynamicTypeBytes = function (type, value) {\n    // TODO: decide what to do with array of strings\n    if (isArrayType(type) || type === 'bytes')\n        return f.formatInputInt(value.length);\n    return \"\";\n};\n\nvar inputTypes = types.inputTypes();\n\n/**\n * Formats input params to bytes\n *\n * @method formatInput\n * @param {Array} abi inputs of method\n * @param {Array} params that will be formatted to bytes\n * @returns bytes representation of input params\n */\nvar formatInput = function (inputs, params) {\n    var bytes = \"\";\n    var toAppendConstant = \"\";\n    var toAppendArrayContent = \"\";\n\n    /// first we iterate in search for dynamic\n    inputs.forEach(function (input, index) {\n        bytes += dynamicTypeBytes(input.type, params[index]);\n    });\n\n    inputs.forEach(function (input, i) {\n        /*jshint maxcomplexity:5 */\n        var typeMatch = false;\n        for (var j = 0; j < inputTypes.length && !typeMatch; j++) {\n            typeMatch = inputTypes[j].type(inputs[i].type, params[i]);\n        }\n        if (!typeMatch) {\n            throwTypeError(inputs[i].type);\n        }\n\n        var formatter = inputTypes[j - 1].format;\n\n        if (isArrayType(inputs[i].type))\n            toAppendArrayContent += params[i].reduce(function (acc, curr) {\n                return acc + formatter(curr);\n            }, \"\");\n        else if (inputs[i].type === 'bytes')\n            toAppendArrayContent += formatter(params[i]);\n        else\n            toAppendConstant += formatter(params[i]);\n    });\n\n    bytes += toAppendConstant + toAppendArrayContent;\n\n    return bytes;\n};\n\n/**\n * This method should be called to predict the length of dynamic type\n *\n * @method dynamicBytesLength\n * @param {String} type\n * @returns {Number} length of dynamic type, 0 or multiplication of ETH_PADDING (32)\n */\nvar dynamicBytesLength = function (type) {\n    if (isArrayType(type) || type === 'bytes')\n        return c.ETH_PADDING * 2;\n    return 0;\n};\n\nvar outputTypes = types.outputTypes();\n\n/** \n * Formats output bytes back to param list\n *\n * @method formatOutput\n * @param {Array} abi outputs of method\n * @param {String} bytes represention of output\n * @returns {Array} output params\n */\nvar formatOutput = function (outs, output) {\n\n    output = output.slice(2);\n    var result = [];\n    var padding = c.ETH_PADDING * 2;\n\n    var dynamicPartLength = outs.reduce(function (acc, curr) {\n        return acc + dynamicBytesLength(curr.type);\n    }, 0);\n\n    var dynamicPart = output.slice(0, dynamicPartLength);\n    output = output.slice(dynamicPartLength);\n\n    outs.forEach(function (out, i) {\n        /*jshint maxcomplexity:6 */\n        var typeMatch = false;\n        for (var j = 0; j < outputTypes.length && !typeMatch; j++) {\n            typeMatch = outputTypes[j].type(outs[i].type);\n        }\n\n        if (!typeMatch) {\n            throwTypeError(outs[i].type);\n        }\n\n        var formatter = outputTypes[j - 1].format;\n        if (isArrayType(outs[i].type)) {\n            var size = f.formatOutputUInt(dynamicPart.slice(0, padding));\n            dynamicPart = dynamicPart.slice(padding);\n            var array = [];\n            for (var k = 0; k < size; k++) {\n                array.push(formatter(output.slice(0, padding)));\n                output = output.slice(padding);\n            }\n            result.push(array);\n        }\n        else if (types.prefixedType('bytes')(outs[i].type)) {\n            dynamicPart = dynamicPart.slice(padding);\n            result.push(formatter(output.slice(0, padding)));\n            output = output.slice(padding);\n        } else {\n            result.push(formatter(output.slice(0, padding)));\n            output = output.slice(padding);\n        }\n    });\n\n    return result;\n};\n\n/**\n * Should be called to create input parser for contract with given abi\n *\n * @method inputParser\n * @param {Array} contract abi\n * @returns {Object} input parser object for given json abi\n * TODO: refactor creating the parser, do not double logic from contract\n */\nvar inputParser = function (json) {\n    var parser = {};\n    json.forEach(function (method) {\n        var displayName = utils.extractDisplayName(method.name);\n        var typeName = utils.extractTypeName(method.name);\n\n        var impl = function () {\n            var params = Array.prototype.slice.call(arguments);\n            return formatInput(method.inputs, params);\n        };\n\n        if (parser[displayName] === undefined) {\n            parser[displayName] = impl;\n        }\n\n        parser[displayName][typeName] = impl;\n    });\n\n    return parser;\n};\n\n/**\n * Should be called to create output parser for contract with given abi\n *\n * @method outputParser\n * @param {Array} contract abi\n * @returns {Object} output parser for given json abi\n */\nvar outputParser = function (json) {\n    var parser = {};\n    json.forEach(function (method) {\n\n        var displayName = utils.extractDisplayName(method.name);\n        var typeName = utils.extractTypeName(method.name);\n\n        var impl = function (output) {\n            return formatOutput(method.outputs, output);\n        };\n\n        if (parser[displayName] === undefined) {\n            parser[displayName] = impl;\n        }\n\n        parser[displayName][typeName] = impl;\n    });\n\n    return parser;\n};\n\nmodule.exports = {\n    inputParser: inputParser,\n    outputParser: outputParser,\n    formatInput: formatInput,\n    formatOutput: formatOutput\n};\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file formatters.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\nif (\"build\" !== 'build') {/*\n    var BigNumber = require('bignumber.js'); // jshint ignore:line\n*/}\n\nvar utils = require('../utils/utils');\nvar c = require('../utils/config');\n\n/**\n * Should be called to pad string to expected length\n *\n * @method padLeft\n * @param {String} string to be padded\n * @param {Number} characters that result string should have\n * @param {String} sign, by default 0\n * @returns {String} right aligned string\n */\nvar padLeft = function (string, chars, sign) {\n    return new Array(chars - string.length + 1).join(sign ? sign : \"0\") + string;\n};\n\n/**\n * Formats input value to byte representation of int\n * If value is negative, return it's two's complement\n * If the value is floating point, round it down\n *\n * @method formatInputInt\n * @param {String|Number|BigNumber} value that needs to be formatted\n * @returns {String} right-aligned byte representation of int\n */\nvar formatInputInt = function (value) {\n    var padding = c.ETH_PADDING * 2;\n    BigNumber.config(c.ETH_BIGNUMBER_ROUNDING_MODE);\n    return padLeft(utils.toTwosComplement(value).round().toString(16), padding);\n};\n\n/**\n * Formats input value to byte representation of string\n *\n * @method formatInputString\n * @param {String}\n * @returns {String} left-algined byte representation of string\n */\nvar formatInputString = function (value) {\n    return utils.fromAscii(value, c.ETH_PADDING).substr(2);\n};\n\n/**\n * Formats input value to byte representation of bool\n *\n * @method formatInputBool\n * @param {Boolean}\n * @returns {String} right-aligned byte representation bool\n */\nvar formatInputBool = function (value) {\n    return '000000000000000000000000000000000000000000000000000000000000000' + (value ?  '1' : '0');\n};\n\n/**\n * Formats input value to byte representation of real\n * Values are multiplied by 2^m and encoded as integers\n *\n * @method formatInputReal\n * @param {String|Number|BigNumber}\n * @returns {String} byte representation of real\n */\nvar formatInputReal = function (value) {\n    return formatInputInt(new BigNumber(value).times(new BigNumber(2).pow(128))); \n};\n\n/**\n * Check if input value is negative\n *\n * @method signedIsNegative\n * @param {String} value is hex format\n * @returns {Boolean} true if it is negative, otherwise false\n */\nvar signedIsNegative = function (value) {\n    return (new BigNumber(value.substr(0, 1), 16).toString(2).substr(0, 1)) === '1';\n};\n\n/**\n * Formats right-aligned output bytes to int\n *\n * @method formatOutputInt\n * @param {String} bytes\n * @returns {BigNumber} right-aligned output bytes formatted to big number\n */\nvar formatOutputInt = function (value) {\n\n    value = value || \"0\";\n\n    // check if it's negative number\n    // it it is, return two's complement\n    if (signedIsNegative(value)) {\n        return new BigNumber(value, 16).minus(new BigNumber('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', 16)).minus(1);\n    }\n    return new BigNumber(value, 16);\n};\n\n/**\n * Formats right-aligned output bytes to uint\n *\n * @method formatOutputUInt\n * @param {String} bytes\n * @returns {BigNumeber} right-aligned output bytes formatted to uint\n */\nvar formatOutputUInt = function (value) {\n    value = value || \"0\";\n    return new BigNumber(value, 16);\n};\n\n/**\n * Formats right-aligned output bytes to real\n *\n * @method formatOutputReal\n * @param {String}\n * @returns {BigNumber} input bytes formatted to real\n */\nvar formatOutputReal = function (value) {\n    return formatOutputInt(value).dividedBy(new BigNumber(2).pow(128)); \n};\n\n/**\n * Formats right-aligned output bytes to ureal\n *\n * @method formatOutputUReal\n * @param {String}\n * @returns {BigNumber} input bytes formatted to ureal\n */\nvar formatOutputUReal = function (value) {\n    return formatOutputUInt(value).dividedBy(new BigNumber(2).pow(128)); \n};\n\n/**\n * Should be used to format output hash\n *\n * @method formatOutputHash\n * @param {String}\n * @returns {String} right-aligned output bytes formatted to hex\n */\nvar formatOutputHash = function (value) {\n    return \"0x\" + value;\n};\n\n/**\n * Should be used to format output bool\n *\n * @method formatOutputBool\n * @param {String}\n * @returns {Boolean} right-aligned input bytes formatted to bool\n */\nvar formatOutputBool = function (value) {\n    return value === '0000000000000000000000000000000000000000000000000000000000000001' ? true : false;\n};\n\n/**\n * Should be used to format output string\n *\n * @method formatOutputString\n * @param {Sttring} left-aligned hex representation of string\n * @returns {String} ascii string\n */\nvar formatOutputString = function (value) {\n    return utils.toAscii(value);\n};\n\n/**\n * Should be used to format output address\n *\n * @method formatOutputAddress\n * @param {String} right-aligned input bytes\n * @returns {String} address\n */\nvar formatOutputAddress = function (value) {\n    return \"0x\" + value.slice(value.length - 40, value.length);\n};\n\nmodule.exports = {\n    formatInputInt: formatInputInt,\n    formatInputString: formatInputString,\n    formatInputBool: formatInputBool,\n    formatInputReal: formatInputReal,\n    formatOutputInt: formatOutputInt,\n    formatOutputUInt: formatOutputUInt,\n    formatOutputReal: formatOutputReal,\n    formatOutputUReal: formatOutputUReal,\n    formatOutputHash: formatOutputHash,\n    formatOutputBool: formatOutputBool,\n    formatOutputString: formatOutputString,\n    formatOutputAddress: formatOutputAddress\n};\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file types.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\nvar f = require('./formatters');\n\n/// @param expected type prefix (string)\n/// @returns function which checks if type has matching prefix. if yes, returns true, otherwise false\nvar prefixedType = function (prefix) {\n    return function (type) {\n        return type.indexOf(prefix) === 0;\n    };\n};\n\n/// @param expected type name (string)\n/// @returns function which checks if type is matching expected one. if yes, returns true, otherwise false\nvar namedType = function (name) {\n    return function (type) {\n        return name === type;\n    };\n};\n\n/// Setups input formatters for solidity types\n/// @returns an array of input formatters \nvar inputTypes = function () {\n    \n    return [\n        { type: prefixedType('uint'), format: f.formatInputInt },\n        { type: prefixedType('int'), format: f.formatInputInt },\n        { type: prefixedType('bytes'), format: f.formatInputString }, \n        { type: prefixedType('real'), format: f.formatInputReal },\n        { type: prefixedType('ureal'), format: f.formatInputReal },\n        { type: namedType('address'), format: f.formatInputInt },\n        { type: namedType('bool'), format: f.formatInputBool }\n    ];\n};\n\n/// Setups output formaters for solidity types\n/// @returns an array of output formatters\nvar outputTypes = function () {\n\n    return [\n        { type: prefixedType('uint'), format: f.formatOutputUInt },\n        { type: prefixedType('int'), format: f.formatOutputInt },\n        { type: prefixedType('bytes'), format: f.formatOutputString },\n        { type: prefixedType('real'), format: f.formatOutputReal },\n        { type: prefixedType('ureal'), format: f.formatOutputUReal },\n        { type: namedType('address'), format: f.formatOutputAddress },\n        { type: namedType('bool'), format: f.formatOutputBool }\n    ];\n};\n\nmodule.exports = {\n    prefixedType: prefixedType,\n    namedType: namedType,\n    inputTypes: inputTypes,\n    outputTypes: outputTypes\n};\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file config.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\n/**\n * Utils\n * \n * @module utils\n */\n\n/**\n * Utility functions\n * \n * @class [utils] config\n * @constructor\n */\n\n/// required to define ETH_BIGNUMBER_ROUNDING_MODE\nif (\"build\" !== 'build') {/*\n    var BigNumber = require('bignumber.js'); // jshint ignore:line\n*/}\n\nvar ETH_UNITS = [ \n    'wei', \n    'Kwei', \n    'Mwei', \n    'Gwei', \n    'szabo', \n    'finney', \n    'ether', \n    'grand', \n    'Mether', \n    'Gether', \n    'Tether', \n    'Pether', \n    'Eether', \n    'Zether', \n    'Yether', \n    'Nether', \n    'Dether', \n    'Vether', \n    'Uether' \n];\n\nmodule.exports = {\n    ETH_PADDING: 32,\n    ETH_SIGNATURE_LENGTH: 4,\n    ETH_UNITS: ETH_UNITS,\n    ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN },\n    ETH_POLLING_TIMEOUT: 1000,\n    ETH_DEFAULTBLOCK: 'latest'\n};\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file utils.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\n/**\n * Utils\n * \n * @module utils\n */\n\n/**\n * Utility functions\n * \n * @class [utils] utils\n * @constructor\n */\n\nif (\"build\" !== 'build') {/*\n    var BigNumber = require('bignumber.js'); // jshint ignore:line\n*/}\n\nvar unitMap = {\n    'wei':      '1',\n    'kwei':     '1000',\n    'ada':      '1000',\n    'mwei':     '1000000',\n    'babbage':  '1000000',\n    'gwei':     '1000000000',\n    'shannon':  '1000000000',\n    'szabo':    '1000000000000',\n    'finney':   '1000000000000000',\n    'ether':    '1000000000000000000',\n    'kether':   '1000000000000000000000',\n    'grand':    '1000000000000000000000',\n    'einstein': '1000000000000000000000',\n    'mether':   '1000000000000000000000000',\n    'gether':   '1000000000000000000000000000',\n    'tether':   '1000000000000000000000000000000'\n};\n\n\n/** Finds first index of array element matching pattern\n *\n * @method findIndex\n * @param {Array}\n * @param {Function} pattern\n * @returns {Number} index of element\n */\nvar findIndex = function (array, callback) {\n    var end = false;\n    var i = 0;\n    for (; i < array.length && !end; i++) {\n        end = callback(array[i]);\n    }\n    return end ? i - 1 : -1;\n};\n\n/** \n * Should be called to get sting from it's hex representation\n *\n * @method toAscii\n * @param {String} string in hex\n * @returns {String} ascii string representation of hex value\n */\nvar toAscii = function(hex) {\n// Find termination\n    var str = \"\";\n    var i = 0, l = hex.length;\n    if (hex.substring(0, 2) === '0x') {\n        i = 2;\n    }\n    for (; i < l; i+=2) {\n        var code = parseInt(hex.substr(i, 2), 16);\n        if (code === 0) {\n            break;\n        }\n\n        str += String.fromCharCode(code);\n    }\n\n    return str;\n};\n    \n/**\n * Shold be called to get hex representation (prefixed by 0x) of ascii string \n *\n * @method fromAscii\n * @param {String} string\n * @returns {String} hex representation of input string\n */\nvar toHexNative = function(str) {\n    var hex = \"\";\n    for(var i = 0; i < str.length; i++) {\n        var n = str.charCodeAt(i).toString(16);\n        hex += n.length < 2 ? '0' + n : n;\n    }\n\n    return hex;\n};\n\n/**\n * Shold be called to get hex representation (prefixed by 0x) of ascii string \n *\n * @method fromAscii\n * @param {String} string\n * @param {Number} optional padding\n * @returns {String} hex representation of input string\n */\nvar fromAscii = function(str, pad) {\n    pad = pad === undefined ? 0 : pad;\n    var hex = toHexNative(str);\n    while (hex.length < pad*2)\n        hex += \"00\";\n    return \"0x\" + hex;\n};\n\n/**\n * Should be called to get display name of contract function\n * \n * @method extractDisplayName\n * @param {String} name of function/event\n * @returns {String} display name for function/event eg. multiply(uint256) -> multiply\n */\nvar extractDisplayName = function (name) {\n    var length = name.indexOf('('); \n    return length !== -1 ? name.substr(0, length) : name;\n};\n\n/// @returns overloaded part of function/event name\nvar extractTypeName = function (name) {\n    /// TODO: make it invulnerable\n    var length = name.indexOf('(');\n    return length !== -1 ? name.substr(length + 1, name.length - 1 - (length + 1)).replace(' ', '') : \"\";\n};\n\n/**\n * Filters all functions from input abi\n *\n * @method filterFunctions\n * @param {Array} abi\n * @returns {Array} abi array with filtered objects of type 'function'\n */\nvar filterFunctions = function (json) {\n    return json.filter(function (current) {\n        return current.type === 'function'; \n    }); \n};\n\n/**\n * Filters all events from input abi\n *\n * @method filterEvents\n * @param {Array} abi\n * @returns {Array} abi array with filtered objects of type 'event'\n */\nvar filterEvents = function (json) {\n    return json.filter(function (current) {\n        return current.type === 'event';\n    });\n};\n\n/**\n * Converts value to it's decimal representation in string\n *\n * @method toDecimal\n * @param {String|Number|BigNumber}\n * @return {String}\n */\nvar toDecimal = function (value) {\n    return toBigNumber(value).toNumber();\n};\n\n/**\n * Converts value to it's hex representation\n *\n * @method fromDecimal\n * @param {String|Number|BigNumber}\n * @return {String}\n */\nvar fromDecimal = function (value) {\n    var number = toBigNumber(value);\n    var result = number.toString(16);\n\n    return number.lessThan(0) ? '-0x' + result.substr(1) : '0x' + result;\n};\n\n/**\n * Auto converts any given value into it's hex representation.\n *\n * And even stringifys objects before.\n *\n * @method toHex\n * @param {String|Number|BigNumber|Object}\n * @return {String}\n */\nvar toHex = function (val) {\n    /*jshint maxcomplexity:7 */\n\n    if(isBoolean(val))\n        return val;\n\n    if(isBigNumber(val))\n        return fromDecimal(val);\n\n    if(isObject(val))\n        return fromAscii(JSON.stringify(val));\n\n    // if its a negative number, pass it through fromDecimal\n    if (isString(val)) {\n        if (val.indexOf('-0x') === 0)\n           return fromDecimal(val);\n        else if (!isFinite(val))\n            return fromAscii(val);\n    }\n\n    return fromDecimal(val);\n};\n\n/**\n * Returns value of unit in Wei\n *\n * @method getValueOfUnit\n * @param {String} unit the unit to convert to, default ether\n * @returns {BigNumber} value of the unit (in Wei)\n * @throws error if the unit is not correct:w\n */\nvar getValueOfUnit = function (unit) {\n    unit = unit ? unit.toLowerCase() : 'ether';\n    var unitValue = unitMap[unit];\n    if (unitValue === undefined) {\n        throw new Error('This unit doesn\\'t exists, please use the one of the following units' + JSON.stringify(unitMap, null, 2));\n    }\n    return new BigNumber(unitValue, 10);\n};\n\n/**\n * Takes a number of wei and converts it to any other ether unit.\n *\n * Possible units are:\n * - kwei/ada\n * - mwei/babbage\n * - gwei/shannon\n * - szabo\n * - finney\n * - ether\n * - kether/grand/einstein\n * - mether\n * - gether\n * - tether\n *\n * @method fromWei\n * @param {Number|String} number can be a number, number string or a HEX of a decimal\n * @param {String} unit the unit to convert to, default ether\n * @return {String|Object} When given a BigNumber object it returns one as well, otherwise a number\n*/\nvar fromWei = function(number, unit) {\n    var returnValue = toBigNumber(number).dividedBy(getValueOfUnit(unit));\n\n    return isBigNumber(number) ? returnValue : returnValue.toString(10); \n};\n\n/**\n * Takes a number of a unit and converts it to wei.\n *\n * Possible units are:\n * - kwei/ada\n * - mwei/babbage\n * - gwei/shannon\n * - szabo\n * - finney\n * - ether\n * - kether/grand/einstein\n * - mether\n * - gether\n * - tether\n *\n * @method toWei\n * @param {Number|String|BigNumber} number can be a number, number string or a HEX of a decimal\n * @param {String} unit the unit to convert from, default ether\n * @return {String|Object} When given a BigNumber object it returns one as well, otherwise a number\n*/\nvar toWei = function(number, unit) {\n    var returnValue = toBigNumber(number).times(getValueOfUnit(unit));\n\n    return isBigNumber(number) ? returnValue : returnValue.toString(10); \n};\n\n/**\n * Takes an input and transforms it into an bignumber\n *\n * @method toBigNumber\n * @param {Number|String|BigNumber} a number, string, HEX string or BigNumber\n * @return {BigNumber} BigNumber\n*/\nvar toBigNumber = function(number) {\n    /*jshint maxcomplexity:5 */\n    number = number || 0;\n    if (isBigNumber(number))\n        return number;\n\n    if (isString(number) && (number.indexOf('0x') === 0 || number.indexOf('-0x') === 0)) {\n        return new BigNumber(number.replace('0x',''), 16);\n    }\n   \n    return new BigNumber(number.toString(10), 10);\n};\n\n/**\n * Takes and input transforms it into bignumber and if it is negative value, into two's complement\n *\n * @method toTwosComplement\n * @param {Number|String|BigNumber}\n * @return {BigNumber}\n */\nvar toTwosComplement = function (number) {\n    var bigNumber = toBigNumber(number);\n    if (bigNumber.lessThan(0)) {\n        return new BigNumber(\"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\", 16).plus(bigNumber).plus(1);\n    }\n    return bigNumber;\n};\n\n/**\n * Checks if the given string has proper length\n *\n * @method isAddress\n * @param {String} address the given HEX adress\n * @return {Boolean}\n*/\nvar isAddress = function(address) {\n    if (!isString(address)) {\n        return false;\n    }\n\n    return ((address.indexOf('0x') === 0 && address.length === 42) ||\n            (address.indexOf('0x') === -1 && address.length === 40));\n};\n\n/**\n * Returns true if object is BigNumber, otherwise false\n *\n * @method isBigNumber\n * @param {Object}\n * @return {Boolean} \n */\nvar isBigNumber = function (object) {\n    return object instanceof BigNumber ||\n        (object && object.constructor && object.constructor.name === 'BigNumber');\n};\n\n/**\n * Returns true if object is string, otherwise false\n * \n * @method isString\n * @param {Object}\n * @return {Boolean}\n */\nvar isString = function (object) {\n    return typeof object === 'string' ||\n        (object && object.constructor && object.constructor.name === 'String');\n};\n\n/**\n * Returns true if object is function, otherwise false\n *\n * @method isFunction\n * @param {Object}\n * @return {Boolean}\n */\nvar isFunction = function (object) {\n    return typeof object === 'function';\n};\n\n/**\n * Returns true if object is Objet, otherwise false\n *\n * @method isObject\n * @param {Object}\n * @return {Boolean}\n */\nvar isObject = function (object) {\n    return typeof object === 'object';\n};\n\n/**\n * Returns true if object is boolean, otherwise false\n *\n * @method isBoolean\n * @param {Object}\n * @return {Boolean}\n */\nvar isBoolean = function (object) {\n    return typeof object === 'boolean';\n};\n\n/**\n * Returns true if object is array, otherwise false\n *\n * @method isArray\n * @param {Object}\n * @return {Boolean}\n */\nvar isArray = function (object) {\n    return object instanceof Array; \n};\n\nmodule.exports = {\n    findIndex: findIndex,\n    toHex: toHex,\n    toDecimal: toDecimal,\n    fromDecimal: fromDecimal,\n    toAscii: toAscii,\n    fromAscii: fromAscii,\n    extractDisplayName: extractDisplayName,\n    extractTypeName: extractTypeName,\n    filterFunctions: filterFunctions,\n    filterEvents: filterEvents,\n    toWei: toWei,\n    fromWei: fromWei,\n    toBigNumber: toBigNumber,\n    toTwosComplement: toTwosComplement,\n    isBigNumber: isBigNumber,\n    isAddress: isAddress,\n    isFunction: isFunction,\n    isString: isString,\n    isObject: isObject,\n    isBoolean: isBoolean,\n    isArray: isArray\n};\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file web3.js\n * @authors:\n *   Jeffrey Wilcke <jeff@ethdev.com>\n *   Marek Kotewicz <marek@ethdev.com>\n *   Marian Oancea <marian@ethdev.com>\n *   Fabian Vogelsteller <fabian@ethdev.com>\n *   Gav Wood <g@ethdev.com>\n * @date 2014\n */\n\nvar version = require('../version.json');\nvar net = require('./web3/net');\nvar eth = require('./web3/eth');\nvar db = require('./web3/db');\nvar shh = require('./web3/shh');\nvar watches = require('./web3/watches');\nvar filter = require('./web3/filter');\nvar utils = require('./utils/utils');\nvar formatters = require('./solidity/formatters');\nvar requestManager = require('./web3/requestmanager');\nvar c = require('./utils/config');\n\n/// @returns an array of objects describing web3 api methods\nvar web3Methods = [\n    { name: 'sha3', call: 'web3_sha3', inputFormatter: utils.toHex },\n];\nvar web3Properties = [\n    { name: 'version.client', getter: 'web3_clientVersion' },\n    { name: 'version.network', getter: 'net_version' }\n];\n\n\n/// creates methods in a given object based on method description on input\n/// setups api calls for these methods\nvar setupMethods = function (obj, methods) {\n    methods.forEach(function (method) {\n        // allow for object methods 'myObject.method'\n        var objectMethods = method.name.split('.'),\n            callFunction = function () {\n                /*jshint maxcomplexity:8 */\n                \n                var callback = null,\n                    args = Array.prototype.slice.call(arguments),\n                    call = typeof method.call === 'function' ? method.call(args) : method.call;\n\n                // get the callback if one is available\n                if(typeof args[args.length-1] === 'function'){\n                    callback = args[args.length-1];\n                    Array.prototype.pop.call(args);\n                }\n\n                // add the defaultBlock if not given\n                if(method.addDefaultblock) {\n                    if(args.length !== method.addDefaultblock)\n                        Array.prototype.push.call(args, (isFinite(c.ETH_DEFAULTBLOCK) ? utils.fromDecimal(c.ETH_DEFAULTBLOCK) : c.ETH_DEFAULTBLOCK));\n                    else\n                        args[args.length-1] = isFinite(args[args.length-1]) ? utils.fromDecimal(args[args.length-1]) : args[args.length-1];\n                }\n\n                // show deprecated warning\n                if(method.newMethod)\n                    console.warn('This method is deprecated please use web3.'+ method.newMethod +'() instead.');\n\n                return web3.manager.send({\n                    method: call,\n                    params: args,\n                    outputFormatter: method.outputFormatter,\n                    inputFormatter: method.inputFormatter,\n                    addDefaultblock: method.addDefaultblock\n                }, callback);\n            };\n\n        if(objectMethods.length > 1) {\n            if(!obj[objectMethods[0]])\n                obj[objectMethods[0]] = {};\n\n            obj[objectMethods[0]][objectMethods[1]] = callFunction;\n        \n        } else {\n\n            obj[objectMethods[0]] = callFunction;\n        }\n\n    });\n};\n\n/// creates properties in a given object based on properties description on input\n/// setups api calls for these properties\nvar setupProperties = function (obj, properties) {\n    properties.forEach(function (property) {\n        var objectProperties = property.name.split('.'),\n            proto = {};\n\n        proto.get = function () {\n\n            // show deprecated warning\n            if(property.newProperty)\n                console.warn('This property is deprecated please use web3.'+ property.newProperty +' instead.');\n\n\n            return web3.manager.send({\n                method: property.getter,\n                outputFormatter: property.outputFormatter\n            });\n        };\n\n        if (property.setter) {\n            proto.set = function (val) {\n\n                // show deprecated warning\n                if(property.newProperty)\n                    console.warn('This property is deprecated please use web3.'+ property.newProperty +' instead.');\n\n                return web3.manager.send({\n                    method: property.setter,\n                    params: [val],\n                    inputFormatter: property.inputFormatter\n                });\n            };\n        }\n\n        proto.enumerable = !property.newProperty;\n\n        if(objectProperties.length > 1) {\n            if(!obj[objectProperties[0]])\n                obj[objectProperties[0]] = {};\n\n            Object.defineProperty(obj[objectProperties[0]], objectProperties[1], proto);        \n        } else\n            Object.defineProperty(obj, property.name, proto);\n\n    });\n};\n\n/*jshint maxparams:4 */\nvar startPolling = function (method, id, callback, uninstall) {\n    web3.manager.startPolling({\n        method: method, \n        params: [id]\n    }, id,  callback, uninstall); \n};\n/*jshint maxparams:3 */\n\nvar stopPolling = function (id) {\n    web3.manager.stopPolling(id);\n};\n\nvar ethWatch = {\n    startPolling: startPolling.bind(null, 'eth_getFilterChanges'), \n    stopPolling: stopPolling\n};\n\nvar shhWatch = {\n    startPolling: startPolling.bind(null, 'shh_getFilterChanges'), \n    stopPolling: stopPolling\n};\n\n/// setups web3 object, and it's in-browser executed methods\nvar web3 = {\n\n    version: {\n        api: version.version\n    },\n\n    manager: requestManager(),\n    providers: {},\n\n    setProvider: function (provider) {\n        web3.manager.setProvider(provider);\n    },\n    \n    /// Should be called to reset state of web3 object\n    /// Resets everything except manager\n    reset: function () {\n        web3.manager.reset(); \n    },\n\n    /// @returns hex string of the input\n    toHex: utils.toHex,\n\n    /// @returns ascii string representation of hex value prefixed with 0x\n    toAscii: utils.toAscii,\n\n    /// @returns hex representation (prefixed by 0x) of ascii string\n    fromAscii: utils.fromAscii,\n\n    /// @returns decimal representaton of hex value prefixed by 0x\n    toDecimal: utils.toDecimal,\n\n    /// @returns hex representation (prefixed by 0x) of decimal value\n    fromDecimal: utils.fromDecimal,\n\n    /// @returns a BigNumber object\n    toBigNumber: utils.toBigNumber,\n\n    toWei: utils.toWei,\n    fromWei: utils.fromWei,\n    isAddress: utils.isAddress,\n\n    // provide network information\n    net: {\n        // peerCount: \n    },\n\n\n    /// eth object prototype\n    eth: {\n        // DEPRECATED\n        contractFromAbi: function (abi) {\n            console.warn('Initiating a contract like this is deprecated please use var MyContract = eth.contract(abi); new MyContract(address); instead.');\n\n            return function(addr) {\n                // Default to address of Config. TODO: rremove prior to genesis.\n                addr = addr || '0xc6d9d2cd449a754c494264e1809c50e34d64562b';\n                var ret = web3.eth.contract(addr, abi);\n                ret.address = addr;\n                return ret;\n            };\n        },\n\n        /// @param filter may be a string, object or event\n        /// @param eventParams is optional, this is an object with optional event eventParams params\n        /// @param options is optional, this is an object with optional event options ('max'...)\n        /*jshint maxparams:4 */\n        filter: function (fil, eventParams, options) {\n\n            // if its event, treat it differently\n            if (fil._isEvent)\n                return fil(eventParams, options);\n\n            return filter(fil, ethWatch, formatters.outputLogFormatter);\n        },\n        // DEPRECATED\n        watch: function (fil, eventParams, options) {\n            console.warn('eth.watch() is deprecated please use eth.filter() instead.');\n            return this.filter(fil, eventParams, options);\n        }\n        /*jshint maxparams:3 */\n    },\n\n    /// db object prototype\n    db: {},\n\n    /// shh object prototype\n    shh: {\n        /// @param filter may be a string, object or event\n        filter: function (fil) {\n            return filter(fil, shhWatch, formatters.outputPostFormatter);\n        },\n        // DEPRECATED\n        watch: function (fil) {\n            console.warn('shh.watch() is deprecated please use shh.filter() instead.');\n            return this.filter(fil);\n        }\n    }\n};\n\n\n// ADD defaultblock\nObject.defineProperty(web3.eth, 'defaultBlock', {\n    get: function () {\n        return c.ETH_DEFAULTBLOCK;\n    },\n    set: function (val) {\n        c.ETH_DEFAULTBLOCK = val;\n        return c.ETH_DEFAULTBLOCK;\n    }\n});\n\n\n/// setups all api methods\nsetupMethods(web3, web3Methods);\nsetupProperties(web3, web3Properties);\nsetupMethods(web3.net, net.methods);\nsetupProperties(web3.net, net.properties);\nsetupMethods(web3.eth, eth.methods);\nsetupProperties(web3.eth, eth.properties);\nsetupMethods(web3.db, db.methods());\nsetupMethods(web3.shh, shh.methods());\nsetupMethods(ethWatch, watches.eth());\nsetupMethods(shhWatch, watches.shh());\n\nmodule.exports = web3;\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file contract.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2014\n */\n\nvar web3 = require('../web3'); \nvar abi = require('../solidity/abi');\nvar utils = require('../utils/utils');\nvar eventImpl = require('./event');\nvar signature = require('./signature');\n\nvar exportNatspecGlobals = function (vars) {\n    // it's used byt natspec.js\n    // TODO: figure out better way to solve this\n    web3._currentContractAbi = vars.abi;\n    web3._currentContractAddress = vars.address;\n    web3._currentContractMethodName = vars.method;\n    web3._currentContractMethodParams = vars.params;\n};\n\nvar addFunctionRelatedPropertiesToContract = function (contract) {\n    \n    contract.call = function (options) {\n        contract._isTransaction = false;\n        contract._options = options;\n        return contract;\n    };\n\n\n    contract.sendTransaction = function (options) {\n        contract._isTransaction = true;\n        contract._options = options;\n        return contract;\n    };\n    // DEPRECATED\n    contract.transact = function (options) {\n\n        console.warn('myContract.transact() is deprecated please use myContract.sendTransaction() instead.');\n\n        return contract.sendTransaction(options);\n    };\n\n    contract._options = {};\n    ['gas', 'gasPrice', 'value', 'from'].forEach(function(p) {\n        contract[p] = function (v) {\n            contract._options[p] = v;\n            return contract;\n        };\n    });\n\n};\n\nvar addFunctionsToContract = function (contract, desc, address) {\n    var inputParser = abi.inputParser(desc);\n    var outputParser = abi.outputParser(desc);\n\n    // create contract functions\n    utils.filterFunctions(desc).forEach(function (method) {\n\n        var displayName = utils.extractDisplayName(method.name);\n        var typeName = utils.extractTypeName(method.name);\n\n        var impl = function () {\n            /*jshint maxcomplexity:7 */\n            var params = Array.prototype.slice.call(arguments);\n            var sign = signature.functionSignatureFromAscii(method.name);\n            var parsed = inputParser[displayName][typeName].apply(null, params);\n\n            var options = contract._options || {};\n            options.to = address;\n            options.data = sign + parsed;\n            \n            var isTransaction = contract._isTransaction === true || (contract._isTransaction !== false && !method.constant);\n            var collapse = options.collapse !== false;\n            \n            // reset\n            contract._options = {};\n            contract._isTransaction = null;\n\n            if (isTransaction) {\n                \n                exportNatspecGlobals({\n                    abi: desc,\n                    address: address,\n                    method: method.name,\n                    params: params\n                });\n\n                // transactions do not have any output, cause we do not know, when they will be processed\n                web3.eth.sendTransaction(options);\n                return;\n            }\n            \n            var output = web3.eth.call(options);\n            var ret = outputParser[displayName][typeName](output);\n            if (collapse)\n            {\n                if (ret.length === 1)\n                    ret = ret[0];\n                else if (ret.length === 0)\n                    ret = null;\n            }\n            return ret;\n        };\n\n        if (contract[displayName] === undefined) {\n            contract[displayName] = impl;\n        }\n\n        contract[displayName][typeName] = impl;\n    });\n};\n\nvar addEventRelatedPropertiesToContract = function (contract, desc, address) {\n    contract.address = address;\n    contract._onWatchEventResult = function (data) {\n        var matchingEvent = event.getMatchingEvent(utils.filterEvents(desc));\n        var parser = eventImpl.outputParser(matchingEvent);\n        return parser(data);\n    };\n    \n    Object.defineProperty(contract, 'topics', {\n        get: function() {\n            return utils.filterEvents(desc).map(function (e) {\n                return signature.eventSignatureFromAscii(e.name);\n            });\n        }\n    });\n\n};\n\nvar addEventsToContract = function (contract, desc, address) {\n    // create contract events\n    utils.filterEvents(desc).forEach(function (e) {\n\n        var impl = function () {\n            var params = Array.prototype.slice.call(arguments);\n            var sign = signature.eventSignatureFromAscii(e.name);\n            var event = eventImpl.inputParser(address, sign, e);\n            var o = event.apply(null, params);\n            var outputFormatter = function (data) {\n                var parser = eventImpl.outputParser(e);\n                return parser(data);\n            };\n            return web3.eth.filter(o, undefined, undefined, outputFormatter);\n        };\n        \n        // this property should be used by eth.filter to check if object is an event\n        impl._isEvent = true;\n\n        var displayName = utils.extractDisplayName(e.name);\n        var typeName = utils.extractTypeName(e.name);\n\n        if (contract[displayName] === undefined) {\n            contract[displayName] = impl;\n        }\n\n        contract[displayName][typeName] = impl;\n\n    });\n};\n\n\n/**\n * This method should be called when we want to call / transact some solidity method from javascript\n * it returns an object which has same methods available as solidity contract description\n * usage example: \n *\n * var abi = [{\n *      name: 'myMethod',\n *      inputs: [{ name: 'a', type: 'string' }],\n *      outputs: [{name: 'd', type: 'string' }]\n * }];  // contract abi\n *\n * var MyContract = web3.eth.contract(abi); // creation of contract prototype\n *\n * var contractInstance = new MyContract('0x0123123121');\n *\n * contractInstance.myMethod('this is test string param for call'); // myMethod call (implicit, default)\n * contractInstance.call().myMethod('this is test string param for call'); // myMethod call (explicit)\n * contractInstance.sendTransaction().myMethod('this is test string param for transact'); // myMethod sendTransaction\n *\n * @param abi - abi json description of the contract, which is being created\n * @returns contract object\n */\nvar contract = function (abi) {\n\n    // return prototype\n    if(abi instanceof Array && arguments.length === 1) {\n        return Contract.bind(null, abi);\n\n    // deprecated: auto initiate contract\n    } else {\n\n        console.warn('Initiating a contract like this is deprecated please use var MyContract = eth.contract(abi); new MyContract(address); instead.');\n\n        return new Contract(arguments[1], arguments[0]);\n    }\n\n};\n\nfunction Contract(abi, address) {\n\n    // workaround for invalid assumption that method.name is the full anonymous prototype of the method.\n    // it's not. it's just the name. the rest of the code assumes it's actually the anonymous\n    // prototype, so we make it so as a workaround.\n    // TODO: we may not want to modify input params, maybe use copy instead?\n    abi.forEach(function (method) {\n        if (method.name.indexOf('(') === -1) {\n            var displayName = method.name;\n            var typeName = method.inputs.map(function(i){return i.type; }).join();\n            method.name = displayName + '(' + typeName + ')';\n        }\n    });\n\n    var result = {};\n    addFunctionRelatedPropertiesToContract(result);\n    addFunctionsToContract(result, abi, address);\n    addEventRelatedPropertiesToContract(result, abi, address);\n    addEventsToContract(result, abi, address);\n\n    return result;\n}\n\nmodule.exports = contract;\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file db.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\n\n/// @returns an array of objects describing web3.db api methods\nvar methods = function () {\n    return [\n    { name: 'putString', call: 'db_putString'},\n    { name: 'getString', call: 'db_getString'},\n    { name: 'putHex', call: 'db_putHex'},\n    { name: 'getHex', call: 'db_getHex'}\n    ];\n};\n\nmodule.exports = {\n    methods: methods\n};\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file eth.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n *   Fabian Vogelsteller <fabian@ethdev.com>\n * @date 2015\n */\n\n/**\n * Web3\n * \n * @module web3\n */\n\n/**\n * Eth methods and properties\n *\n * An example method object can look as follows:\n *\n *      {\n *      name: 'getBlock',\n *      call: blockCall,\n *      outputFormatter: formatters.outputBlockFormatter,\n *      inputFormatter: [ // can be a formatter funciton or an array of functions. Where each item in the array will be used for one parameter\n *           utils.toHex, // formats paramter 1\n *           function(param){ if(!param) return false; } // formats paramter 2\n *         ]\n *       },\n *\n * @class [web3] eth\n * @constructor\n */\n\n\nvar formatters = require('./formatters');\nvar utils = require('../utils/utils');\n\n\nvar blockCall = function (args) {\n    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? \"eth_getBlockByHash\" : \"eth_getBlockByNumber\";\n};\n\nvar transactionFromBlockCall = function (args) {\n    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? 'eth_getTransactionByBlockHashAndIndex' : 'eth_getTransactionByBlockNumberAndIndex';\n};\n\nvar uncleCall = function (args) {\n    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? 'eth_getUncleByBlockHashAndIndex' : 'eth_getUncleByBlockNumberAndIndex';\n};\n\nvar getBlockTransactionCountCall = function (args) {\n    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? 'eth_getBlockTransactionCountByHash' : 'eth_getBlockTransactionCountByNumber';\n};\n\nvar uncleCountCall = function (args) {\n    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? 'eth_getUncleCountByBlockHash' : 'eth_getUncleCountByBlockNumber';\n};\n\n/// @returns an array of objects describing web3.eth api methods\nvar methods = [\n    { name: 'getBalance', call: 'eth_getBalance', addDefaultblock: 2,\n        outputFormatter: formatters.convertToBigNumber},\n    { name: 'getStorage', call: 'eth_getStorage', addDefaultblock: 2},\n    { name: 'getStorageAt', call: 'eth_getStorageAt', addDefaultblock: 3,\n        inputFormatter: utils.toHex},\n    { name: 'getData', call: 'eth_getData', addDefaultblock: 2},\n    { name: 'getBlock', call: blockCall,\n        outputFormatter: formatters.outputBlockFormatter,\n        inputFormatter: [utils.toHex, function(param){ return (!param) ? false : true; }]},\n    { name: 'getUncle', call: uncleCall,\n        outputFormatter: formatters.outputBlockFormatter,\n        inputFormatter: [utils.toHex, utils.toHex, function(param){ return (!param) ? false : true; }]},\n    { name: 'getCompilers', call: 'eth_getCompilers' },\n    { name: 'getBlockTransactionCount', call: getBlockTransactionCountCall,\n        outputFormatter: utils.toDecimal,\n        inputFormatter: utils.toHex },\n    { name: 'getBlockUncleCount', call: uncleCountCall,\n        outputFormatter: utils.toDecimal,\n        inputFormatter: utils.toHex },\n    { name: 'getTransaction', call: 'eth_getTransactionByHash',\n        outputFormatter: formatters.outputTransactionFormatter },\n    { name: 'getTransactionFromBlock', call: transactionFromBlockCall,\n        outputFormatter: formatters.outputTransactionFormatter,\n        inputFormatter: utils.toHex },\n    { name: 'getTransactionCount', call: 'eth_getTransactionCount', addDefaultblock: 2,\n        outputFormatter: utils.toDecimal},\n    { name: 'sendTransaction', call: 'eth_sendTransaction',\n        inputFormatter: formatters.inputTransactionFormatter },\n    { name: 'call', call: 'eth_call', addDefaultblock: 2,\n        inputFormatter: formatters.inputCallFormatter },\n    { name: 'compile.solidity', call: 'eth_compileSolidity' },\n    { name: 'compile.lll', call: 'eth_compileLLL', inputFormatter: utils.toHex },\n    { name: 'compile.serpent', call: 'eth_compileSerpent', inputFormatter: utils.toHex },\n    { name: 'flush', call: 'eth_flush' },\n\n    // deprecated methods\n    { name: 'balanceAt', call: 'eth_balanceAt', newMethod: 'eth.getBalance' },\n    { name: 'stateAt', call: 'eth_stateAt', newMethod: 'eth.getStorageAt' },\n    { name: 'storageAt', call: 'eth_storageAt', newMethod: 'eth.getStorage' },\n    { name: 'countAt', call: 'eth_countAt', newMethod: 'eth.getTransactionCount' },\n    { name: 'codeAt', call: 'eth_codeAt', newMethod: 'eth.getData' },\n    { name: 'transact', call: 'eth_transact', newMethod: 'eth.sendTransaction' },\n    { name: 'block', call: blockCall, newMethod: 'eth.getBlock' },\n    { name: 'transaction', call: transactionFromBlockCall, newMethod: 'eth.getTransaction' },\n    { name: 'uncle', call: uncleCall, newMethod: 'eth.getUncle' },\n    { name: 'compilers', call: 'eth_compilers', newMethod: 'eth.getCompilers' },\n    { name: 'solidity', call: 'eth_solidity', newMethod: 'eth.compile.solidity' },\n    { name: 'lll', call: 'eth_lll', newMethod: 'eth.compile.lll' },\n    { name: 'serpent', call: 'eth_serpent', newMethod: 'eth.compile.serpent' },\n    { name: 'transactionCount', call: getBlockTransactionCountCall, newMethod: 'eth.getBlockTransactionCount' },\n    { name: 'uncleCount', call: uncleCountCall, newMethod: 'eth.getBlockUncleCount' },\n    { name: 'logs', call: 'eth_logs' }\n];\n\n/// @returns an array of objects describing web3.eth api properties\nvar properties = [\n    { name: 'coinbase', getter: 'eth_coinbase'},\n    { name: 'mining', getter: 'eth_mining'},\n    { name: 'gasPrice', getter: 'eth_gasPrice', outputFormatter: formatters.convertToBigNumber},\n    { name: 'accounts', getter: 'eth_accounts' },\n    { name: 'blockNumber', getter: 'eth_blockNumber', outputFormatter: utils.toDecimal},\n\n    // deprecated properties\n    { name: 'listening', getter: 'net_listening', setter: 'eth_setListening', newProperty: 'net.listening'},\n    { name: 'peerCount', getter: 'net_peerCount', newProperty: 'net.peerCount'},\n    { name: 'number', getter: 'eth_number', newProperty: 'eth.blockNumber'}\n];\n\n\nmodule.exports = {\n    methods: methods,\n    properties: properties\n};\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file event.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2014\n */\n\nvar abi = require('../solidity/abi');\nvar utils = require('../utils/utils');\nvar signature = require('./signature');\n\n/// filter inputs array && returns only indexed (or not) inputs\n/// @param inputs array\n/// @param bool if result should be an array of indexed params on not\n/// @returns array of (not?) indexed params\nvar filterInputs = function (inputs, indexed) {\n    return inputs.filter(function (current) {\n        return current.indexed === indexed;\n    });\n};\n\nvar inputWithName = function (inputs, name) {\n    var index = utils.findIndex(inputs, function (input) {\n        return input.name === name;\n    });\n    \n    if (index === -1) {\n        console.error('indexed param with name ' + name + ' not found');\n        return undefined;\n    }\n    return inputs[index];\n};\n\nvar indexedParamsToTopics = function (event, indexed) {\n    // sort keys?\n    return Object.keys(indexed).map(function (key) {\n        var inputs = [inputWithName(filterInputs(event.inputs, true), key)];\n\n        var value = indexed[key];\n        if (value instanceof Array) {\n            return value.map(function (v) {\n                return abi.formatInput(inputs, [v]);\n            }); \n        }\n        return abi.formatInput(inputs, [value]);\n    });\n};\n\nvar inputParser = function (address, sign, event) {\n    \n    // valid options are 'earliest', 'latest', 'offset' and 'max', as defined for 'eth.filter'\n    return function (indexed, options) {\n        var o = options || {};\n        o.address = address;\n        o.topics = [];\n        o.topics.push(sign);\n        if (indexed) {\n            o.topics = o.topics.concat(indexedParamsToTopics(event, indexed));\n        }\n        return o;\n    };\n};\n\nvar getArgumentsObject = function (inputs, indexed, notIndexed) {\n    var indexedCopy = indexed.slice();\n    var notIndexedCopy = notIndexed.slice();\n    return inputs.reduce(function (acc, current) {\n        var value;\n        if (current.indexed)\n            value = indexedCopy.splice(0, 1)[0];\n        else\n            value = notIndexedCopy.splice(0, 1)[0];\n\n        acc[current.name] = value;\n        return acc;\n    }, {}); \n};\n \nvar outputParser = function (event) {\n    \n    return function (output) {\n        var result = {\n            event: utils.extractDisplayName(event.name),\n            number: output.number,\n            hash: output.hash,\n            args: {}\n        };\n\n        output.topics = output.topic; // fallback for go-ethereum\n        if (!output.topics) {\n            return result;\n        }\n       \n        var indexedOutputs = filterInputs(event.inputs, true);\n        var indexedData = \"0x\" + output.topics.slice(1, output.topics.length).map(function (topics) { return topics.slice(2); }).join(\"\");\n        var indexedRes = abi.formatOutput(indexedOutputs, indexedData);\n\n        var notIndexedOutputs = filterInputs(event.inputs, false);\n        var notIndexedRes = abi.formatOutput(notIndexedOutputs, output.data);\n\n        result.args = getArgumentsObject(event.inputs, indexedRes, notIndexedRes);\n\n        return result;\n    };\n};\n\nvar getMatchingEvent = function (events, payload) {\n    for (var i = 0; i < events.length; i++) {\n        var sign = signature.eventSignatureFromAscii(events[i].name); \n        if (sign === payload.topics[0]) {\n            return events[i];\n        }\n    }\n    return undefined;\n};\n\n\nmodule.exports = {\n    inputParser: inputParser,\n    outputParser: outputParser,\n    getMatchingEvent: getMatchingEvent\n};\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file filter.js\n * @authors:\n *   Jeffrey Wilcke <jeff@ethdev.com>\n *   Marek Kotewicz <marek@ethdev.com>\n *   Marian Oancea <marian@ethdev.com>\n *   Fabian Vogelsteller <fabian@ethdev.com>\n *   Gav Wood <g@ethdev.com>\n * @date 2014\n */\n\nvar utils = require('../utils/utils');\n\n/// Should be called to check if filter implementation is valid\n/// @returns true if it is, otherwise false\nvar implementationIsValid = function (i) {\n    return !!i && \n        typeof i.newFilter === 'function' && \n        typeof i.getLogs === 'function' && \n        typeof i.uninstallFilter === 'function' &&\n        typeof i.startPolling === 'function' &&\n        typeof i.stopPolling === 'function';\n};\n\n/// This method should be called on options object, to verify deprecated properties && lazy load dynamic ones\n/// @param should be string or object\n/// @returns options string or object\nvar getOptions = function (options) {\n    /*jshint maxcomplexity:9 */\n\n    if (typeof options === 'string') {\n        return options;\n    } \n\n    options = options || {};\n\n    if (options.topic) {\n        console.warn('\"topic\" is deprecated, is \"topics\" instead');\n        options.topics = options.topic;\n    }\n\n    if (options.earliest) {\n        console.warn('\"earliest\" is deprecated, is \"fromBlock\" instead');\n        options.fromBlock = options.earliest;\n    }\n\n    if (options.latest) {\n        console.warn('\"latest\" is deprecated, is \"toBlock\" instead');\n        options.toBlock = options.latest;\n    }\n\n    if (options.skip) {\n        console.warn('\"skip\" is deprecated, is \"offset\" instead');\n        options.offset = options.skip;\n    }\n\n    if (options.max) {\n        console.warn('\"max\" is deprecated, is \"limit\" instead');\n        options.limit = options.max;\n    }\n\n    // make sure topics, get converted to hex\n    if(options.topics instanceof Array) {\n        options.topics = options.topics.map(function(topic){\n            return utils.toHex(topic);\n        });\n    }\n\n\n    // evaluate lazy properties\n    return {\n        fromBlock: utils.toHex(options.fromBlock),\n        toBlock: utils.toHex(options.toBlock),\n        limit: utils.toHex(options.limit),\n        offset: utils.toHex(options.offset),\n        to: options.to,\n        address: options.address,\n        topics: options.topics\n    };\n};\n\n/// Should be used when we want to watch something\n/// it's using inner polling mechanism and is notified about changes\n/// @param options are filter options\n/// @param implementation, an abstract polling implementation\n/// @param formatter (optional), callback function which formats output before 'real' callback \nvar filter = function(options, implementation, formatter) {\n    if (!implementationIsValid(implementation)) {\n        console.error('filter implemenation is invalid');\n        return;\n    }\n\n    options = getOptions(options);\n    var callbacks = [];\n    var filterId = implementation.newFilter(options);\n\n    // call the callbacks\n    var onMessages = function (messages) {\n        messages.forEach(function (message) {\n            message = formatter ? formatter(message) : message;\n            callbacks.forEach(function (callback) {\n                callback(message);\n            });\n        });\n    };\n\n    implementation.startPolling(filterId, onMessages, implementation.uninstallFilter);\n\n    var watch = function(callback) {\n        callbacks.push(callback);\n    };\n\n    var stopWatching = function() {\n        implementation.stopPolling(filterId);\n        implementation.uninstallFilter(filterId);\n        callbacks = [];\n    };\n\n    var get = function () {\n        var results = implementation.getLogs(filterId);\n\n        return utils.isArray(results) ? results.map(function(message){\n                return formatter ? formatter(message) : message;\n            }) : results;\n    };\n    \n    return {\n        watch: watch,\n        stopWatching: stopWatching,\n        get: get,\n\n        // DEPRECATED methods\n        changed:  function(){\n            console.warn('watch().changed() is deprecated please use filter().watch() instead.');\n            return watch.apply(this, arguments);\n        },\n        arrived:  function(){\n            console.warn('watch().arrived() is deprecated please use filter().watch() instead.');\n            return watch.apply(this, arguments);\n        },\n        happened:  function(){\n            console.warn('watch().happened() is deprecated please use filter().watch() instead.');\n            return watch.apply(this, arguments);\n        },\n        uninstall: function(){\n            console.warn('watch().uninstall() is deprecated please use filter().stopWatching() instead.');\n            return stopWatching.apply(this, arguments);\n        },\n        messages: function(){\n            console.warn('watch().messages() is deprecated please use filter().get() instead.');\n            return get.apply(this, arguments);\n        },\n        logs: function(){\n            console.warn('watch().logs() is deprecated please use filter().get() instead.');\n            return get.apply(this, arguments);\n        }\n    };\n};\n\nmodule.exports = filter;\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file formatters.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n *   Fabian Vogelsteller <fabian@ethdev.com>\n * @date 2015\n */\n\nvar utils = require('../utils/utils');\n\n/**\n * Should the input to a big number\n *\n * @method convertToBigNumber\n * @param {String|Number|BigNumber}\n * @returns {BigNumber} object\n */\nvar convertToBigNumber = function (value) {\n    return utils.toBigNumber(value);\n};\n\n/**\n * Formats the input of a transaction and converts all values to HEX\n *\n * @method inputTransactionFormatter\n * @param {Object} transaction options\n * @returns object\n*/\nvar inputTransactionFormatter = function (options){\n\n    // make code -> data\n    if (options.code) {\n        options.data = options.code;\n        delete options.code;\n    }\n\n    ['gasPrice', 'gas', 'value'].forEach(function(key){\n        options[key] = utils.fromDecimal(options[key]);\n    });\n\n    return options;\n};\n\n/**\n * Formats the output of a transaction to its proper values\n * \n * @method outputTransactionFormatter\n * @param {Object} transaction\n * @returns {Object} transaction\n*/\nvar outputTransactionFormatter = function (tx){\n    tx.gas = utils.toDecimal(tx.gas);\n    tx.gasPrice = utils.toBigNumber(tx.gasPrice);\n    tx.value = utils.toBigNumber(tx.value);\n    return tx;\n};\n\n/**\n * Formats the input of a call and converts all values to HEX\n *\n * @method inputCallFormatter\n * @param {Object} transaction options\n * @returns object\n*/\nvar inputCallFormatter = function (options){\n\n    // make code -> data\n    if (options.code) {\n        options.data = options.code;\n        delete options.code;\n    }\n\n    return options;\n};\n\n\n/**\n * Formats the output of a block to its proper values\n *\n * @method outputBlockFormatter\n * @param {Object} block object \n * @returns {Object} block object\n*/\nvar outputBlockFormatter = function(block){\n\n    // transform to number\n    block.gasLimit = utils.toDecimal(block.gasLimit);\n    block.gasUsed = utils.toDecimal(block.gasUsed);\n    block.size = utils.toDecimal(block.size);\n    block.timestamp = utils.toDecimal(block.timestamp);\n    block.number = utils.toDecimal(block.number);\n\n    block.minGasPrice = utils.toBigNumber(block.minGasPrice);\n    block.difficulty = utils.toBigNumber(block.difficulty);\n    block.totalDifficulty = utils.toBigNumber(block.totalDifficulty);\n\n    if(block.transactions instanceof Array) {\n        block.transactions.forEach(function(item){\n            if(!utils.isString(item))\n                return outputTransactionFormatter(item);\n        });\n    }\n\n    return block;\n};\n\n/**\n * Formats the output of a log\n * \n * @method outputLogFormatter\n * @param {Object} log object\n * @returns {Object} log\n*/\nvar outputLogFormatter = function(log){\n    log.blockNumber = utils.toDecimal(log.blockNumber);\n    log.transactionIndex = utils.toDecimal(log.transactionIndex);\n    log.logIndex = utils.toDecimal(log.logIndex);\n\n    return log;\n};\n\n\n/**\n * Formats the input of a whisper post and converts all values to HEX\n *\n * @method inputPostFormatter\n * @param {Object} transaction object\n * @returns {Object}\n*/\nvar inputPostFormatter = function(post){\n\n    post.payload = utils.toHex(post.payload);\n    post.ttl = utils.fromDecimal(post.ttl);\n    post.priority = utils.fromDecimal(post.priority);\n\n    if(!(post.topics instanceof Array))\n        post.topics = [post.topics];\n\n\n    // format the following options\n    post.topics = post.topics.map(function(topic){\n        return utils.fromAscii(topic);\n    });\n\n    return post;\n};\n\n/**\n * Formats the output of a received post message\n *\n * @method outputPostFormatter\n * @param {Object}\n * @returns {Object}\n */\nvar outputPostFormatter = function(post){\n\n    post.expiry = utils.toDecimal(post.expiry);\n    post.sent = utils.toDecimal(post.sent);\n    post.ttl = utils.toDecimal(post.ttl);\n    post.workProved = utils.toDecimal(post.workProved);\n    post.payloadRaw = post.payload;\n    post.payload = utils.toAscii(post.payload);\n\n    if(post.payload.indexOf('{') === 0 || post.payload.indexOf('[') === 0) {\n        try {\n            post.payload = JSON.parse(post.payload);\n        } catch (e) { }\n    }\n\n    // format the following options\n    post.topics = post.topics.map(function(topic){\n        return utils.toAscii(topic);\n    });\n\n    return post;\n};\n\nmodule.exports = {\n    convertToBigNumber: convertToBigNumber,\n    inputTransactionFormatter: inputTransactionFormatter,\n    outputTransactionFormatter: outputTransactionFormatter,\n    inputCallFormatter: inputCallFormatter,\n    outputBlockFormatter: outputBlockFormatter,\n    outputLogFormatter: outputLogFormatter,\n    inputPostFormatter: inputPostFormatter,\n    outputPostFormatter: outputPostFormatter\n};\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file httpprovider.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n *   Marian Oancea <marian@ethdev.com>\n *   Fabian Vogelsteller <fabian@ethdev.com>\n * @date 2014\n */\n\nif (\"build\" !== 'build') {/*\n        var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line\n*/}\n\nvar HttpProvider = function (host) {\n    this.name  = 'HTTP';\n    this.handlers = [];\n    this.host = host || 'http://localhost:8080';\n};\n\nHttpProvider.prototype.send = function (payload, callback) {\n    var request = new XMLHttpRequest();\n\n    // ASYNC\n    if(typeof callback === 'function') {\n        request.onreadystatechange = function() {\n            if(request.readyState === 4) {\n                var result = '';\n                try {\n                    result = JSON.parse(request.responseText);\n                } catch(error) {\n                    result = error;\n                }\n                callback(result, request.status);\n            }\n        };\n\n        request.open('POST', this.host, true);\n        request.send(JSON.stringify(payload));\n\n    // SYNC\n    } else {\n        request.open('POST', this.host, false);\n        request.send(JSON.stringify(payload));\n\n        // check request.status\n        if(request.status !== 200)\n            return;\n        return JSON.parse(request.responseText);\n        \n    }\n};\n\nmodule.exports = HttpProvider;\n\n",
     "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file jsonrpc.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\nvar messageId = 1;\n\n/// Should be called to valid json create payload object\n/// @param method of jsonrpc call, required\n/// @param params, an array of method params, optional\n/// @returns valid jsonrpc payload object\nvar toPayload = function (method, params) {\n    if (!method)\n        console.error('jsonrpc method should be specified!');\n\n    return {\n        jsonrpc: '2.0',\n        method: method,\n        params: params || [],\n        id: messageId++\n    }; \n};\n\n/// Should be called to check if jsonrpc response is valid\n/// @returns true if response is valid, otherwise false \nvar isValidResponse = function (response) {\n    return !!response &&\n        !response.error &&\n        response.jsonrpc === '2.0' &&\n        typeof response.id === 'number' &&\n        response.result !== undefined; // only undefined is not valid json object\n};\n\n/// Should be called to create batch payload object\n/// @param messages, an array of objects with method (required) and params (optional) fields\nvar toBatchPayload = function (messages) {\n    return messages.map(function (message) {\n        return toPayload(message.method, message.params);\n    }); \n};\n\nmodule.exports = {\n    toPayload: toPayload,\n    isValidResponse: isValidResponse,\n    toBatchPayload: toBatchPayload\n};\n\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file eth.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\nvar utils = require('../utils/utils');\n\n/// @returns an array of objects describing web3.eth api methods\nvar methods = [\n    // { name: 'getBalance', call: 'eth_balanceAt', outputFormatter: formatters.convertToBigNumber},\n];\n\n/// @returns an array of objects describing web3.eth api properties\nvar properties = [\n    { name: 'listening', getter: 'net_listening'},\n    { name: 'peerCount', getter: 'net_peerCount', outputFormatter: utils.toDecimal },\n];\n\n\nmodule.exports = {\n    methods: methods,\n    properties: properties\n};\n\n",
     "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file qtsync.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n *   Marian Oancea <marian@ethdev.com>\n * @date 2014\n */\n\nvar QtSyncProvider = function () {\n};\n\nQtSyncProvider.prototype.send = function (payload) {\n    var result = navigator.qt.callMethod(JSON.stringify(payload));\n    return JSON.parse(result);\n};\n\nmodule.exports = QtSyncProvider;\n\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file requestmanager.js\n * @authors:\n *   Jeffrey Wilcke <jeff@ethdev.com>\n *   Marek Kotewicz <marek@ethdev.com>\n *   Marian Oancea <marian@ethdev.com>\n *   Gav Wood <g@ethdev.com>\n * @date 2014\n */\n\nvar jsonrpc = require('./jsonrpc');\nvar c = require('./const');\n\n/**\n * It's responsible for passing messages to providers\n * It's also responsible for polling the ethereum node for incoming messages\n * Default poll timeout is 1 second\n */\nvar requestManager = function() {\n    var polls = [];\n    var timeout = null;\n    var provider;\n\n    var send = function (data) {\n        var payload = jsonrpc.toPayload(data.method, data.params);\n        \n        if (!provider) {\n            console.error('provider is not set');\n            return null;\n        }\n\n        var result = provider.send(payload);\n\n        if (!jsonrpc.isValidResponse(result)) {\n            console.log(result);\n            return null;\n        }\n        \n        return result.result;\n    };\n\n    var setProvider = function (p) {\n        provider = p;\n    };\n\n    /*jshint maxparams:4 */\n    var startPolling = function (data, pollId, callback, uninstall) {\n        polls.push({data: data, id: pollId, callback: callback, uninstall: uninstall});\n    };\n    /*jshint maxparams:3 */\n\n    var stopPolling = function (pollId) {\n        for (var i = polls.length; i--;) {\n            var poll = polls[i];\n            if (poll.id === pollId) {\n                polls.splice(i, 1);\n            }\n        }\n    };\n\n    var reset = function () {\n        polls.forEach(function (poll) {\n            poll.uninstall(poll.id); \n        });\n        polls = [];\n\n        if (timeout) {\n            clearTimeout(timeout);\n            timeout = null;\n        }\n        poll();\n    };\n\n    var poll = function () {\n        polls.forEach(function (data) {\n            var result = send(data.data);\n            if (!(result instanceof Array) || result.length === 0) {\n                return;\n            }\n            data.callback(result);\n        });\n        timeout = setTimeout(poll, c.ETH_POLLING_TIMEOUT);\n    };\n    \n    poll();\n\n    return {\n        send: send,\n        setProvider: setProvider,\n        startPolling: startPolling,\n        stopPolling: stopPolling,\n        reset: reset\n    };\n};\n\nmodule.exports = requestManager;\n\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file shh.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\n/// @returns an array of objects describing web3.shh api methods\nvar methods = function () {\n    return [\n    { name: 'post', call: 'shh_post' },\n    { name: 'newIdentity', call: 'shh_newIdentity' },\n    { name: 'haveIdentity', call: 'shh_haveIdentity' },\n    { name: 'newGroup', call: 'shh_newGroup' },\n    { name: 'addToGroup', call: 'shh_addToGroup' }\n    ];\n};\n\nmodule.exports = {\n    methods: methods\n};\n\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file signature.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\nvar web3 = require('./web3'); \nvar c = require('./const');\n\n/// @param function name for which we want to get signature\n/// @returns signature of function with given name\nvar functionSignatureFromAscii = function (name) {\n    return web3.sha3(web3.fromAscii(name)).slice(0, 2 + c.ETH_SIGNATURE_LENGTH * 2);\n};\n\n/// @param event name for which we want to get signature\n/// @returns signature of event with given name\nvar eventSignatureFromAscii = function (name) {\n    return web3.sha3(web3.fromAscii(name));\n};\n\nmodule.exports = {\n    functionSignatureFromAscii: functionSignatureFromAscii,\n    eventSignatureFromAscii: eventSignatureFromAscii\n};\n\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file types.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\nvar f = require('./formatters');\n\n/// @param expected type prefix (string)\n/// @returns function which checks if type has matching prefix. if yes, returns true, otherwise false\nvar prefixedType = function (prefix) {\n    return function (type) {\n        return type.indexOf(prefix) === 0;\n    };\n};\n\n/// @param expected type name (string)\n/// @returns function which checks if type is matching expected one. if yes, returns true, otherwise false\nvar namedType = function (name) {\n    return function (type) {\n        return name === type;\n    };\n};\n\n/// Setups input formatters for solidity types\n/// @returns an array of input formatters \nvar inputTypes = function () {\n    \n    return [\n        { type: prefixedType('uint'), format: f.formatInputInt },\n        { type: prefixedType('int'), format: f.formatInputInt },\n        { type: prefixedType('hash'), format: f.formatInputInt },\n        { type: prefixedType('string'), format: f.formatInputString }, \n        { type: prefixedType('real'), format: f.formatInputReal },\n        { type: prefixedType('ureal'), format: f.formatInputReal },\n        { type: namedType('address'), format: f.formatInputInt },\n        { type: namedType('bool'), format: f.formatInputBool }\n    ];\n};\n\n/// Setups output formaters for solidity types\n/// @returns an array of output formatters\nvar outputTypes = function () {\n\n    return [\n        { type: prefixedType('uint'), format: f.formatOutputUInt },\n        { type: prefixedType('int'), format: f.formatOutputInt },\n        { type: prefixedType('hash'), format: f.formatOutputHash },\n        { type: prefixedType('string'), format: f.formatOutputString },\n        { type: prefixedType('real'), format: f.formatOutputReal },\n        { type: prefixedType('ureal'), format: f.formatOutputUReal },\n        { type: namedType('address'), format: f.formatOutputAddress },\n        { type: namedType('bool'), format: f.formatOutputBool }\n    ];\n};\n\nmodule.exports = {\n    prefixedType: prefixedType,\n    namedType: namedType,\n    inputTypes: inputTypes,\n    outputTypes: outputTypes\n};\n\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file utils.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\nvar c = require('./const');\n\n/// Finds first index of array element matching pattern\n/// @param array\n/// @param callback pattern\n/// @returns index of element\nvar findIndex = function (array, callback) {\n    var end = false;\n    var i = 0;\n    for (; i < array.length && !end; i++) {\n        end = callback(array[i]);\n    }\n    return end ? i - 1 : -1;\n};\n\n/// @returns ascii string representation of hex value prefixed with 0x\nvar toAscii = function(hex) {\n// Find termination\n    var str = \"\";\n    var i = 0, l = hex.length;\n    if (hex.substring(0, 2) === '0x') {\n        i = 2;\n    }\n    for (; i < l; i+=2) {\n        var code = parseInt(hex.substr(i, 2), 16);\n        if (code === 0) {\n            break;\n        }\n\n        str += String.fromCharCode(code);\n    }\n\n    return str;\n};\n    \nvar toHex = function(str) {\n    var hex = \"\";\n    for(var i = 0; i < str.length; i++) {\n        var n = str.charCodeAt(i).toString(16);\n        hex += n.length < 2 ? '0' + n : n;\n    }\n\n    return hex;\n};\n\n/// @returns hex representation (prefixed by 0x) of ascii string\nvar fromAscii = function(str, pad) {\n    pad = pad === undefined ? 0 : pad;\n    var hex = toHex(str);\n    while (hex.length < pad*2)\n        hex += \"00\";\n    return \"0x\" + hex;\n};\n\n/// @returns display name for function/event eg. multiply(uint256) -> multiply\nvar extractDisplayName = function (name) {\n    var length = name.indexOf('('); \n    return length !== -1 ? name.substr(0, length) : name;\n};\n\n/// @returns overloaded part of function/event name\nvar extractTypeName = function (name) {\n    /// TODO: make it invulnerable\n    var length = name.indexOf('(');\n    return length !== -1 ? name.substr(length + 1, name.length - 1 - (length + 1)).replace(' ', '') : \"\";\n};\n\n/// Filters all function from input abi\n/// @returns abi array with filtered objects of type 'function'\nvar filterFunctions = function (json) {\n    return json.filter(function (current) {\n        return current.type === 'function'; \n    }); \n};\n\n/// Filters all events form input abi\n/// @returns abi array with filtered objects of type 'event'\nvar filterEvents = function (json) {\n    return json.filter(function (current) {\n        return current.type === 'event';\n    });\n};\n\n/// used to transform value/string to eth string\n/// TODO: use BigNumber.js to parse int\n/// TODO: add tests for it!\nvar toEth = function (str) {\n     /*jshint maxcomplexity:7 */\n    var val = typeof str === \"string\" ? str.indexOf('0x') === 0 ? parseInt(str.substr(2), 16) : parseInt(str) : str;\n    var unit = 0;\n    var units = c.ETH_UNITS;\n    while (val > 3000 && unit < units.length - 1)\n    {\n        val /= 1000;\n        unit++;\n    }\n    var s = val.toString().length < val.toFixed(2).length ? val.toString() : val.toFixed(2);\n    var replaceFunction = function($0, $1, $2) {\n        return $1 + ',' + $2;\n    };\n\n    while (true) {\n        var o = s;\n        s = s.replace(/(\\d)(\\d\\d\\d[\\.\\,])/, replaceFunction);\n        if (o === s)\n            break;\n    }\n    return s + ' ' + units[unit];\n};\n\nmodule.exports = {\n    findIndex: findIndex,\n    toAscii: toAscii,\n    fromAscii: fromAscii,\n    extractDisplayName: extractDisplayName,\n    extractTypeName: extractTypeName,\n    filterFunctions: filterFunctions,\n    filterEvents: filterEvents,\n    toEth: toEth\n};\n\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file watches.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\n/// @returns an array of objects describing web3.eth.watch api methods\nvar eth = function () {\n    var newFilter = function (args) {\n        return typeof args[0] === 'string' ? 'eth_newFilterString' : 'eth_newFilter';\n    };\n\n    return [\n    { name: 'newFilter', call: newFilter },\n    { name: 'uninstallFilter', call: 'eth_uninstallFilter' },\n    { name: 'getMessages', call: 'eth_filterLogs' }\n    ];\n};\n\n/// @returns an array of objects describing web3.shh.watch api methods\nvar shh = function () {\n    return [\n    { name: 'newFilter', call: 'shh_newFilter' },\n    { name: 'uninstallFilter', call: 'shh_uninstallFilter' },\n    { name: 'getMessages', call: 'shh_getMessages' }\n    ];\n};\n\nmodule.exports = {\n    eth: eth,\n    shh: shh\n};\n\n",
-    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file web3.js\n * @authors:\n *   Jeffrey Wilcke <jeff@ethdev.com>\n *   Marek Kotewicz <marek@ethdev.com>\n *   Marian Oancea <marian@ethdev.com>\n *   Gav Wood <g@ethdev.com>\n * @date 2014\n */\n\nif (\"build\" !== 'build') {/*\n    var BigNumber = require('bignumber.js');\n*/}\n\nvar eth = require('./eth');\nvar db = require('./db');\nvar shh = require('./shh');\nvar watches = require('./watches');\nvar filter = require('./filter');\nvar utils = require('./utils');\nvar requestManager = require('./requestmanager');\n\n/// @returns an array of objects describing web3 api methods\nvar web3Methods = function () {\n    return [\n    { name: 'sha3', call: 'web3_sha3' }\n    ];\n};\n\n/// creates methods in a given object based on method description on input\n/// setups api calls for these methods\nvar setupMethods = function (obj, methods) {\n    methods.forEach(function (method) {\n        obj[method.name] = function () {\n            var args = Array.prototype.slice.call(arguments);\n            var call = typeof method.call === 'function' ? method.call(args) : method.call;\n            return web3.manager.send({\n                method: call,\n                params: args\n            });\n        };\n    });\n};\n\n/// creates properties in a given object based on properties description on input\n/// setups api calls for these properties\nvar setupProperties = function (obj, properties) {\n    properties.forEach(function (property) {\n        var proto = {};\n        proto.get = function () {\n            return web3.manager.send({\n                method: property.getter\n            });\n        };\n\n        if (property.setter) {\n            proto.set = function (val) {\n                return web3.manager.send({\n                    method: property.setter,\n                    params: [val]\n                });\n            };\n        }\n        Object.defineProperty(obj, property.name, proto);\n    });\n};\n\n/*jshint maxparams:4 */\nvar startPolling = function (method, id, callback, uninstall) {\n    web3.manager.startPolling({\n        method: method, \n        params: [id]\n    }, id,  callback, uninstall); \n};\n/*jshint maxparams:3 */\n\nvar stopPolling = function (id) {\n    web3.manager.stopPolling(id);\n};\n\nvar ethWatch = {\n    startPolling: startPolling.bind(null, 'eth_changed'), \n    stopPolling: stopPolling\n};\n\nvar shhWatch = {\n    startPolling: startPolling.bind(null, 'shh_changed'), \n    stopPolling: stopPolling\n};\n\n/// setups web3 object, and it's in-browser executed methods\nvar web3 = {\n    manager: requestManager(),\n    providers: {},\n\n    /// @returns ascii string representation of hex value prefixed with 0x\n    toAscii: utils.toAscii,\n\n    /// @returns hex representation (prefixed by 0x) of ascii string\n    fromAscii: utils.fromAscii,\n\n    /// @returns decimal representaton of hex value prefixed by 0x\n    toDecimal: function (val) {\n        // remove 0x and place 0, if it's required\n        val = val.length > 2 ? val.substring(2) : \"0\";\n        return (new BigNumber(val, 16).toString(10));\n    },\n\n    /// @returns hex representation (prefixed by 0x) of decimal value\n    fromDecimal: function (val) {\n        return \"0x\" + (new BigNumber(val).toString(16));\n    },\n\n    /// used to transform value/string to eth string\n    toEth: utils.toEth,\n\n    /// eth object prototype\n    eth: {\n        contractFromAbi: function (abi) {\n            return function(addr) {\n                // Default to address of Config. TODO: rremove prior to genesis.\n                addr = addr || '0xc6d9d2cd449a754c494264e1809c50e34d64562b';\n                var ret = web3.eth.contract(addr, abi);\n                ret.address = addr;\n                return ret;\n            };\n        },\n\n        canary: function (abi) {\n            return function(addr) {\n                // Default to address of Config. TODO: rremove prior to genesis.\n                addr = addr || '0xc6d9d2cd449a754c494264e1809c50e34d64562b';\n                return addr;\n            };\n        },\n\n        /// @param filter may be a string, object or event\n        /// @param indexed is optional, this is an object with optional event indexed params\n        /// @param options is optional, this is an object with optional event options ('max'...)\n        /// TODO: fix it, 4 params? no way\n        /*jshint maxparams:4 */\n        watch: function (fil, indexed, options, formatter) {\n            if (fil._isEvent) {\n                return fil(indexed, options);\n            }\n            return filter(fil, ethWatch, formatter);\n        }\n        /*jshint maxparams:3 */\n    },\n\n    /// db object prototype\n    db: {},\n\n    /// shh object prototype\n    shh: {\n        /// @param filter may be a string, object or event\n        watch: function (fil) {\n            return filter(fil, shhWatch);\n        }\n    },\n    setProvider: function (provider) {\n        web3.manager.setProvider(provider);\n    },\n    \n    /// Should be called to reset state of web3 object\n    /// Resets everything except manager\n    reset: function () {\n        web3.manager.reset(); \n    }\n};\n\n/// setups all api methods\nsetupMethods(web3, web3Methods());\nsetupMethods(web3.eth, eth.methods());\nsetupProperties(web3.eth, eth.properties());\nsetupMethods(web3.db, db.methods());\nsetupMethods(web3.shh, shh.methods());\nsetupMethods(ethWatch, watches.eth());\nsetupMethods(shhWatch, watches.shh());\n\nmodule.exports = web3;\n\n",
-    "var web3 = require('./lib/web3');\nweb3.providers.HttpSyncProvider = require('./lib/httpsync');\nweb3.providers.QtSyncProvider = require('./lib/qtsync');\nweb3.eth.contract = require('./lib/contract');\nweb3.abi = require('./lib/abi');\n\nmodule.exports = web3;\n"
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file requestmanager.js\n * @authors:\n *   Jeffrey Wilcke <jeff@ethdev.com>\n *   Marek Kotewicz <marek@ethdev.com>\n *   Marian Oancea <marian@ethdev.com>\n *   Fabian Vogelsteller <fabian@ethdev.com>\n *   Gav Wood <g@ethdev.com>\n * @date 2014\n */\n\nvar jsonrpc = require('./jsonrpc');\nvar c = require('../utils/config');\n\n/**\n * It's responsible for passing messages to providers\n * It's also responsible for polling the ethereum node for incoming messages\n * Default poll timeout is 1 second\n */\nvar requestManager = function() {\n    var polls = [];\n    var timeout = null;\n    var provider;\n\n    var send = function (data, callback) {\n        /*jshint maxcomplexity: 8 */\n\n        // FORMAT BASED ON ONE FORMATTER function\n        if(typeof data.inputFormatter === 'function') {\n            data.params = Array.prototype.map.call(data.params, function(item, index){\n                // format everything besides the defaultblock, which is already formated\n                return (!data.addDefaultblock || index+1 < data.addDefaultblock) ? data.inputFormatter(item) : item;\n            });\n\n        // FORMAT BASED ON the input FORMATTER ARRAY\n        } else if(data.inputFormatter instanceof Array) {\n            data.params = Array.prototype.map.call(data.inputFormatter, function(formatter, index){\n                // format everything besides the defaultblock, which is already formated\n                return (!data.addDefaultblock || index+1 < data.addDefaultblock) ? formatter(data.params[index]) : data.params[index];\n            });\n        }\n\n\n        var payload = jsonrpc.toPayload(data.method, data.params);\n        \n        if (!provider) {\n            console.error('provider is not set');\n            return null;\n        }\n\n        // HTTP ASYNC (only when callback is given, and it a HttpProvidor)\n        if(typeof callback === 'function' && provider.name === 'HTTP'){\n            provider.send(payload, function(result, status){\n\n                if (!jsonrpc.isValidResponse(result)) {\n                    if(typeof result === 'object' && result.error && result.error.message) {\n                        console.error(result.error.message);\n                        callback(result.error);\n                    } else {\n                        callback(new Error({\n                            status: status,\n                            error: result,\n                            message: 'Bad Request'\n                        }));\n                    }\n                    return null;\n                }\n\n                // format the output\n                callback(null, (typeof data.outputFormatter === 'function') ? data.outputFormatter(result.result) : result.result);\n            });\n\n        // SYNC\n        } else {\n            var result = provider.send(payload);\n\n            if (!jsonrpc.isValidResponse(result)) {\n                if(typeof result === 'object' && result.error && result.error.message)\n                    console.error(result.error.message);\n                return null;\n            }\n\n            // format the output\n            return (typeof data.outputFormatter === 'function') ? data.outputFormatter(result.result) : result.result;\n        }\n        \n    };\n\n    var setProvider = function (p) {\n        provider = p;\n    };\n\n    /*jshint maxparams:4 */\n    var startPolling = function (data, pollId, callback, uninstall) {\n        polls.push({data: data, id: pollId, callback: callback, uninstall: uninstall});\n    };\n    /*jshint maxparams:3 */\n\n    var stopPolling = function (pollId) {\n        for (var i = polls.length; i--;) {\n            var poll = polls[i];\n            if (poll.id === pollId) {\n                polls.splice(i, 1);\n            }\n        }\n    };\n\n    var reset = function () {\n        polls.forEach(function (poll) {\n            poll.uninstall(poll.id); \n        });\n        polls = [];\n\n        if (timeout) {\n            clearTimeout(timeout);\n            timeout = null;\n        }\n        poll();\n    };\n\n    var poll = function () {\n        polls.forEach(function (data) {\n            // send async\n            send(data.data, function(error, result){\n                if (!(result instanceof Array) || result.length === 0) {\n                    return;\n                }\n                data.callback(result);\n            });\n        });\n        timeout = setTimeout(poll, c.ETH_POLLING_TIMEOUT);\n    };\n    \n    poll();\n\n    return {\n        send: send,\n        setProvider: setProvider,\n        startPolling: startPolling,\n        stopPolling: stopPolling,\n        reset: reset\n    };\n};\n\nmodule.exports = requestManager;\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file shh.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\nvar formatters = require('./formatters');\n\n/// @returns an array of objects describing web3.shh api methods\nvar methods = function () {\n    return [\n    { name: 'post', call: 'shh_post', inputFormatter: formatters.inputPostFormatter },\n    { name: 'newIdentity', call: 'shh_newIdentity' },\n    { name: 'hasIdentity', call: 'shh_hasIdentity' },\n    { name: 'newGroup', call: 'shh_newGroup' },\n    { name: 'addToGroup', call: 'shh_addToGroup' },\n\n    // deprecated\n    { name: 'haveIdentity', call: 'shh_haveIdentity', newMethod: 'shh.hasIdentity' },\n    ];\n};\n\nmodule.exports = {\n    methods: methods\n};\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file signature.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\nvar web3 = require('../web3'); \nvar c = require('../utils/config');\n\n/// @param function name for which we want to get signature\n/// @returns signature of function with given name\nvar functionSignatureFromAscii = function (name) {\n    return web3.sha3(web3.fromAscii(name)).slice(0, 2 + c.ETH_SIGNATURE_LENGTH * 2);\n};\n\n/// @param event name for which we want to get signature\n/// @returns signature of event with given name\nvar eventSignatureFromAscii = function (name) {\n    return web3.sha3(web3.fromAscii(name));\n};\n\nmodule.exports = {\n    functionSignatureFromAscii: functionSignatureFromAscii,\n    eventSignatureFromAscii: eventSignatureFromAscii\n};\n\n",
+    "/*\n    This file is part of ethereum.js.\n\n    ethereum.js is free software: you can redistribute it and/or modify\n    it under the terms of the GNU Lesser General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    ethereum.js is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU Lesser General Public License for more details.\n\n    You should have received a copy of the GNU Lesser General Public License\n    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.\n*/\n/** @file watches.js\n * @authors:\n *   Marek Kotewicz <marek@ethdev.com>\n * @date 2015\n */\n\n/// @returns an array of objects describing web3.eth.filter api methods\nvar eth = function () {\n    var newFilter = function (args) {\n        return typeof args[0] === 'string' ? 'eth_newBlockFilter' : 'eth_newFilter';\n    };\n\n    return [\n    { name: 'newFilter', call: newFilter },\n    { name: 'uninstallFilter', call: 'eth_uninstallFilter' },\n    { name: 'getLogs', call: 'eth_getFilterLogs' }\n    ];\n};\n\n/// @returns an array of objects describing web3.shh.watch api methods\nvar shh = function () {\n    return [\n    { name: 'newFilter', call: 'shh_newFilter' },\n    { name: 'uninstallFilter', call: 'shh_uninstallFilter' },\n    { name: 'getLogs', call: 'shh_getMessages' }\n    ];\n};\n\nmodule.exports = {\n    eth: eth,\n    shh: shh\n};\n\n",
+    "module.exports={\n    \"version\": \"0.1.3\"\n}",
+    "var web3 = require('./lib/web3');\nweb3.providers.HttpProvider = require('./lib/web3/httpprovider');\nweb3.providers.QtSyncProvider = require('./lib/web3/qtsync');\nweb3.eth.contract = require('./lib/web3/contract');\nweb3.abi = require('./lib/solidity/abi');\n\nmodule.exports = web3;\n"
   ]
 }
\ No newline at end of file
diff --git a/libjsqrc/ethereumjs/dist/ethereum.min.js b/libjsqrc/ethereumjs/dist/ethereum.min.js
index e65ae4f09..e0cb5a491 100644
--- a/libjsqrc/ethereumjs/dist/ethereum.min.js
+++ b/libjsqrc/ethereumjs/dist/ethereum.min.js
@@ -1 +1 @@
-require=function t(n,e,r){function o(i,u){if(!e[i]){if(!n[i]){var f="function"==typeof require&&require;if(!u&&f)return f(i,!0);if(a)return a(i,!0);var s=new Error("Cannot find module '"+i+"'");throw s.code="MODULE_NOT_FOUND",s}var c=e[i]={exports:{}};n[i][0].call(c.exports,function(t){var e=n[i][1][t];return o(e?e:t)},c,c.exports,t,n,e,r)}return e[i].exports}for(var a="function"==typeof require&&require,i=0;i<r.length;i++)o(r[i]);return o}({1:[function(t,n){var e=t("./utils"),r=t("./types"),o=t("./const"),a=t("./formatters"),i=function(t){console.error("parser does not support type: "+t)},u=function(t){return"[]"===t.slice(-2)},f=function(t,n){return u(t)||"string"===t?a.formatInputInt(n.length):""},s=r.inputTypes(),c=function(t,n){var e="",r="",o="";return t.forEach(function(t,r){e+=f(t.type,n[r])}),t.forEach(function(e,a){for(var f=!1,c=0;c<s.length&&!f;c++)f=s[c].type(t[a].type,n[a]);f||i(t[a].type);var l=s[c-1].format;u(t[a].type)?o+=n[a].reduce(function(t,n){return t+l(n)},""):"string"===t[a].type?o+=l(n[a]):r+=l(n[a])}),e+=r+o},l=function(t){return u(t)||"string"===t?2*o.ETH_PADDING:0},p=r.outputTypes(),m=function(t,n){n=n.slice(2);var e=[],f=2*o.ETH_PADDING,s=t.reduce(function(t,n){return t+l(n.type)},0),c=n.slice(0,s);return n=n.slice(s),t.forEach(function(o,s){for(var l=!1,m=0;m<p.length&&!l;m++)l=p[m].type(t[s].type);l||i(t[s].type);var h=p[m-1].format;if(u(t[s].type)){var d=a.formatOutputUInt(c.slice(0,f));c=c.slice(f);for(var g=[],v=0;d>v;v++)g.push(h(n.slice(0,f))),n=n.slice(f);e.push(g)}else r.prefixedType("string")(t[s].type)?(c=c.slice(f),e.push(h(n.slice(0,f))),n=n.slice(f)):(e.push(h(n.slice(0,f))),n=n.slice(f))}),e},h=function(t){var n={};return t.forEach(function(t){var r=e.extractDisplayName(t.name),o=e.extractTypeName(t.name),a=function(){var n=Array.prototype.slice.call(arguments);return c(t.inputs,n)};void 0===n[r]&&(n[r]=a),n[r][o]=a}),n},d=function(t){var n={};return t.forEach(function(t){var r=e.extractDisplayName(t.name),o=e.extractTypeName(t.name),a=function(n){return m(t.outputs,n)};void 0===n[r]&&(n[r]=a),n[r][o]=a}),n};n.exports={inputParser:h,outputParser:d,formatInput:c,formatOutput:m}},{"./const":2,"./formatters":8,"./types":15,"./utils":16}],2:[function(t,n){var e=["wei","Kwei","Mwei","Gwei","szabo","finney","ether","grand","Mether","Gether","Tether","Pether","Eether","Zether","Yether","Nether","Dether","Vether","Uether"];n.exports={ETH_PADDING:32,ETH_SIGNATURE_LENGTH:4,ETH_UNITS:e,ETH_BIGNUMBER_ROUNDING_MODE:{ROUNDING_MODE:BigNumber.ROUND_DOWN},ETH_POLLING_TIMEOUT:1e3}},{}],3:[function(t,n){var e=t("./web3"),r=t("./abi"),o=t("./utils"),a=t("./event"),i=t("./signature"),u=function(t){e._currentContractAbi=t.abi,e._currentContractAddress=t.address,e._currentContractMethodName=t.method,e._currentContractMethodParams=t.params},f=function(t){t.call=function(n){return t._isTransact=!1,t._options=n,t},t.transact=function(n){return t._isTransact=!0,t._options=n,t},t._options={},["gas","gasPrice","value","from"].forEach(function(n){t[n]=function(e){return t._options[n]=e,t}})},s=function(t,n,a){var f=r.inputParser(n),s=r.outputParser(n);o.filterFunctions(n).forEach(function(r){var c=o.extractDisplayName(r.name),l=o.extractTypeName(r.name),p=function(){var o=Array.prototype.slice.call(arguments),p=i.functionSignatureFromAscii(r.name),m=f[c][l].apply(null,o),h=t._options||{};h.to=a,h.data=p+m;var d=t._isTransact===!0||t._isTransact!==!1&&!r.constant,g=h.collapse!==!1;if(t._options={},t._isTransact=null,d)return u({abi:n,address:a,method:r.name,params:o}),void e.eth.transact(h);var v=e.eth.call(h),y=s[c][l](v);return g&&(1===y.length?y=y[0]:0===y.length&&(y=null)),y};void 0===t[c]&&(t[c]=p),t[c][l]=p})},c=function(t,n,e){t.address=e,t._onWatchEventResult=function(t){var e=event.getMatchingEvent(o.filterEvents(n)),r=a.outputParser(e);return r(t)},Object.defineProperty(t,"topic",{get:function(){return o.filterEvents(n).map(function(t){return i.eventSignatureFromAscii(t.name)})}})},l=function(t,n,r){o.filterEvents(n).forEach(function(n){var u=function(){var t=Array.prototype.slice.call(arguments),o=i.eventSignatureFromAscii(n.name),u=a.inputParser(r,o,n),f=u.apply(null,t),s=function(t){var e=a.outputParser(n);return e(t)};return e.eth.watch(f,void 0,void 0,s)};u._isEvent=!0;var f=o.extractDisplayName(n.name),s=o.extractTypeName(n.name);void 0===t[f]&&(t[f]=u),t[f][s]=u})},p=function(t,n){n.forEach(function(t){if(-1===t.name.indexOf("(")){var n=t.name,e=t.inputs.map(function(t){return t.type}).join();t.name=n+"("+e+")"}});var e={};return f(e),s(e,n,t),c(e,n,t),l(e,n,t),e};n.exports=p},{"./abi":1,"./event":6,"./signature":14,"./utils":16,"./web3":18}],4:[function(t,n){var e=function(){return[{name:"put",call:"db_put"},{name:"get",call:"db_get"},{name:"putString",call:"db_putString"},{name:"getString",call:"db_getString"}]};n.exports={methods:e}},{}],5:[function(t,n){var e=function(){var t=function(t){return"string"==typeof t[0]?"eth_blockByHash":"eth_blockByNumber"},n=function(t){return"string"==typeof t[0]?"eth_transactionByHash":"eth_transactionByNumber"},e=function(t){return"string"==typeof t[0]?"eth_uncleByHash":"eth_uncleByNumber"},r=function(t){return"string"==typeof t[0]?"eth_transactionCountByHash":"eth_transactionCountByNumber"},o=function(t){return"string"==typeof t[0]?"eth_uncleCountByHash":"eth_uncleCountByNumber"};return[{name:"balanceAt",call:"eth_balanceAt"},{name:"stateAt",call:"eth_stateAt"},{name:"storageAt",call:"eth_storageAt"},{name:"countAt",call:"eth_countAt"},{name:"codeAt",call:"eth_codeAt"},{name:"transact",call:"eth_transact"},{name:"call",call:"eth_call"},{name:"block",call:t},{name:"transaction",call:n},{name:"uncle",call:e},{name:"compilers",call:"eth_compilers"},{name:"flush",call:"eth_flush"},{name:"lll",call:"eth_lll"},{name:"solidity",call:"eth_solidity"},{name:"serpent",call:"eth_serpent"},{name:"logs",call:"eth_logs"},{name:"transactionCount",call:r},{name:"uncleCount",call:o}]},r=function(){return[{name:"coinbase",getter:"eth_coinbase",setter:"eth_setCoinbase"},{name:"listening",getter:"eth_listening",setter:"eth_setListening"},{name:"mining",getter:"eth_mining",setter:"eth_setMining"},{name:"gasPrice",getter:"eth_gasPrice"},{name:"accounts",getter:"eth_accounts"},{name:"peerCount",getter:"eth_peerCount"},{name:"defaultBlock",getter:"eth_defaultBlock",setter:"eth_setDefaultBlock"},{name:"number",getter:"eth_number"}]};n.exports={methods:e,properties:r}},{}],6:[function(t,n){var e=t("./abi"),r=t("./utils"),o=t("./signature"),a=function(t,n){return t.filter(function(t){return t.indexed===n})},i=function(t,n){var e=r.findIndex(t,function(t){return t.name===n});return-1===e?void console.error("indexed param with name "+n+" not found"):t[e]},u=function(t,n){return Object.keys(n).map(function(r){var o=[i(a(t.inputs,!0),r)],u=n[r];return u instanceof Array?u.map(function(t){return e.formatInput(o,[t])}):e.formatInput(o,[u])})},f=function(t,n,e){return function(r,o){var a=o||{};return a.address=t,a.topic=[],a.topic.push(n),r&&(a.topic=a.topic.concat(u(e,r))),a}},s=function(t,n,e){var r=n.slice(),o=e.slice();return t.reduce(function(t,n){var e;return e=n.indexed?r.splice(0,1)[0]:o.splice(0,1)[0],t[n.name]=e,t},{})},c=function(t){return function(n){var o={event:r.extractDisplayName(t.name),number:n.number,hash:n.hash,args:{}};if(n.topics=n.topic,!n.topic)return o;var i=a(t.inputs,!0),u="0x"+n.topic.slice(1,n.topic.length).map(function(t){return t.slice(2)}).join(""),f=e.formatOutput(i,u),c=a(t.inputs,!1),l=e.formatOutput(c,n.data);return o.args=s(t.inputs,f,l),o}},l=function(t,n){for(var e=0;e<t.length;e++){var r=o.eventSignatureFromAscii(t[e].name);if(r===n.topic[0])return t[e]}return void 0};n.exports={inputParser:f,outputParser:c,getMatchingEvent:l}},{"./abi":1,"./signature":14,"./utils":16}],7:[function(t,n){var e=function(t){return!!t&&"function"==typeof t.newFilter&&"function"==typeof t.getMessages&&"function"==typeof t.uninstallFilter&&"function"==typeof t.startPolling&&"function"==typeof t.stopPolling},r=function(t){return"string"==typeof t?t:(t=t||{},t.topics&&console.warn('"topics" is deprecated, is "topic" instead'),{to:t.to,topic:t.topic,earliest:t.earliest,latest:t.latest,max:t.max,skip:t.skip,address:t.address})},o=function(t,n,o){if(!e(n))return void console.error("filter implemenation is invalid");t=r(t);var a=[],i=n.newFilter(t),u=function(t){t.forEach(function(t){t=o?o(t):t,a.forEach(function(n){n(t)})})};n.startPolling(i,u,n.uninstallFilter);var f=function(t){a.push(t)},s=function(){return n.getMessages(i)},c=function(){n.stopPolling(i),n.uninstallFilter(i),a=[]};return{changed:f,arrived:f,happened:f,messages:s,logs:s,uninstall:c}};n.exports=o},{}],8:[function(t,n){var e=t("./utils"),r=t("./const"),o=function(t,n,e){return new Array(n-t.length+1).join(e?e:"0")+t},a=function(t){var n=2*r.ETH_PADDING;return t instanceof BigNumber||"number"==typeof t?("number"==typeof t&&(t=new BigNumber(t)),BigNumber.config(r.ETH_BIGNUMBER_ROUNDING_MODE),t=t.round(),t.lessThan(0)&&(t=new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",16).plus(t).plus(1)),t=t.toString(16)):t=0===t.indexOf("0x")?t.substr(2):"string"==typeof t?a(new BigNumber(t)):(+t).toString(16),o(t,n)},i=function(t){return e.fromAscii(t,r.ETH_PADDING).substr(2)},u=function(t){return"000000000000000000000000000000000000000000000000000000000000000"+(t?"1":"0")},f=function(t){return a(new BigNumber(t).times(new BigNumber(2).pow(128)))},s=function(t){return"1"===new BigNumber(t.substr(0,1),16).toString(2).substr(0,1)},c=function(t){return t=t||"0",s(t)?new BigNumber(t,16).minus(new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",16)).minus(1):new BigNumber(t,16)},l=function(t){return t=t||"0",new BigNumber(t,16)},p=function(t){return c(t).dividedBy(new BigNumber(2).pow(128))},m=function(t){return l(t).dividedBy(new BigNumber(2).pow(128))},h=function(t){return"0x"+t},d=function(t){return"0000000000000000000000000000000000000000000000000000000000000001"===t?!0:!1},g=function(t){return e.toAscii(t)},v=function(t){return"0x"+t.slice(t.length-40,t.length)};n.exports={formatInputInt:a,formatInputString:i,formatInputBool:u,formatInputReal:f,formatOutputInt:c,formatOutputUInt:l,formatOutputReal:p,formatOutputUReal:m,formatOutputHash:h,formatOutputBool:d,formatOutputString:g,formatOutputAddress:v}},{"./const":2,"./utils":16}],9:[function(t,n){var e=function(t){this.handlers=[],this.host=t||"http://127.0.0.1:8080"};e.prototype.send=function(t){var n=new XMLHttpRequest;n.open("POST",this.host,!1),n.send(JSON.stringify(t));var e=n.responseText;return 200===n.status?JSON.parse(e):void 0},n.exports=e},{}],10:[function(t,n){var e=1,r=function(t,n){return t||console.error("jsonrpc method should be specified!"),{jsonrpc:"2.0",method:t,params:n||[],id:e++}},o=function(t){return!!t&&!t.error&&"2.0"===t.jsonrpc&&"number"==typeof t.id&&void 0!==t.result},a=function(t){return t.map(function(t){return r(t.method,t.params)})};n.exports={toPayload:r,isValidResponse:o,toBatchPayload:a}},{}],11:[function(t,n){var e=function(){};e.prototype.send=function(t){var n=navigator.qt.callMethod(JSON.stringify(t));return JSON.parse(n)},n.exports=e},{}],12:[function(t,n){var e=t("./jsonrpc"),r=t("./const"),o=function(){var t,n=[],o=null,a=function(n){var r=e.toPayload(n.method,n.params);if(!t)return console.error("provider is not set"),null;var o=t.send(r);return e.isValidResponse(o)?o.result:(console.log(o),null)},i=function(n){t=n},u=function(t,e,r,o){n.push({data:t,id:e,callback:r,uninstall:o})},f=function(t){for(var e=n.length;e--;){var r=n[e];r.id===t&&n.splice(e,1)}},s=function(){n.forEach(function(t){t.uninstall(t.id)}),n=[],o&&(clearTimeout(o),o=null),c()},c=function(){n.forEach(function(t){var n=a(t.data);n instanceof Array&&0!==n.length&&t.callback(n)}),o=setTimeout(c,r.ETH_POLLING_TIMEOUT)};return c(),{send:a,setProvider:i,startPolling:u,stopPolling:f,reset:s}};n.exports=o},{"./const":2,"./jsonrpc":10}],13:[function(t,n){var e=function(){return[{name:"post",call:"shh_post"},{name:"newIdentity",call:"shh_newIdentity"},{name:"haveIdentity",call:"shh_haveIdentity"},{name:"newGroup",call:"shh_newGroup"},{name:"addToGroup",call:"shh_addToGroup"}]};n.exports={methods:e}},{}],14:[function(t,n){var e=t("./web3"),r=t("./const"),o=function(t){return e.sha3(e.fromAscii(t)).slice(0,2+2*r.ETH_SIGNATURE_LENGTH)},a=function(t){return e.sha3(e.fromAscii(t))};n.exports={functionSignatureFromAscii:o,eventSignatureFromAscii:a}},{"./const":2,"./web3":18}],15:[function(t,n){var e=t("./formatters"),r=function(t){return function(n){return 0===n.indexOf(t)}},o=function(t){return function(n){return t===n}},a=function(){return[{type:r("uint"),format:e.formatInputInt},{type:r("int"),format:e.formatInputInt},{type:r("hash"),format:e.formatInputInt},{type:r("string"),format:e.formatInputString},{type:r("real"),format:e.formatInputReal},{type:r("ureal"),format:e.formatInputReal},{type:o("address"),format:e.formatInputInt},{type:o("bool"),format:e.formatInputBool}]},i=function(){return[{type:r("uint"),format:e.formatOutputUInt},{type:r("int"),format:e.formatOutputInt},{type:r("hash"),format:e.formatOutputHash},{type:r("string"),format:e.formatOutputString},{type:r("real"),format:e.formatOutputReal},{type:r("ureal"),format:e.formatOutputUReal},{type:o("address"),format:e.formatOutputAddress},{type:o("bool"),format:e.formatOutputBool}]};n.exports={prefixedType:r,namedType:o,inputTypes:a,outputTypes:i}},{"./formatters":8}],16:[function(t,n){var e=t("./const"),r=function(t,n){for(var e=!1,r=0;r<t.length&&!e;r++)e=n(t[r]);return e?r-1:-1},o=function(t){var n="",e=0,r=t.length;for("0x"===t.substring(0,2)&&(e=2);r>e;e+=2){var o=parseInt(t.substr(e,2),16);if(0===o)break;n+=String.fromCharCode(o)}return n},a=function(t){for(var n="",e=0;e<t.length;e++){var r=t.charCodeAt(e).toString(16);n+=r.length<2?"0"+r:r}return n},i=function(t,n){n=void 0===n?0:n;for(var e=a(t);e.length<2*n;)e+="00";return"0x"+e},u=function(t){var n=t.indexOf("(");return-1!==n?t.substr(0,n):t},f=function(t){var n=t.indexOf("(");return-1!==n?t.substr(n+1,t.length-1-(n+1)).replace(" ",""):""},s=function(t){return t.filter(function(t){return"function"===t.type})},c=function(t){return t.filter(function(t){return"event"===t.type})},l=function(t){for(var n="string"==typeof t?0===t.indexOf("0x")?parseInt(t.substr(2),16):parseInt(t):t,r=0,o=e.ETH_UNITS;n>3e3&&r<o.length-1;)n/=1e3,r++;for(var a=n.toString().length<n.toFixed(2).length?n.toString():n.toFixed(2),i=function(t,n,e){return n+","+e};;){var u=a;if(a=a.replace(/(\d)(\d\d\d[\.\,])/,i),u===a)break}return a+" "+o[r]};n.exports={findIndex:r,toAscii:o,fromAscii:i,extractDisplayName:u,extractTypeName:f,filterFunctions:s,filterEvents:c,toEth:l}},{"./const":2}],17:[function(t,n){var e=function(){var t=function(t){return"string"==typeof t[0]?"eth_newFilterString":"eth_newFilter"};return[{name:"newFilter",call:t},{name:"uninstallFilter",call:"eth_uninstallFilter"},{name:"getMessages",call:"eth_filterLogs"}]},r=function(){return[{name:"newFilter",call:"shh_newFilter"},{name:"uninstallFilter",call:"shh_uninstallFilter"},{name:"getMessages",call:"shh_getMessages"}]};n.exports={eth:e,shh:r}},{}],18:[function(t,n){var e=t("./eth"),r=t("./db"),o=t("./shh"),a=t("./watches"),i=t("./filter"),u=t("./utils"),f=t("./requestmanager"),s=function(){return[{name:"sha3",call:"web3_sha3"}]},c=function(t,n){n.forEach(function(n){t[n.name]=function(){var t=Array.prototype.slice.call(arguments),e="function"==typeof n.call?n.call(t):n.call;return g.manager.send({method:e,params:t})}})},l=function(t,n){n.forEach(function(n){var e={};e.get=function(){return g.manager.send({method:n.getter})},n.setter&&(e.set=function(t){return g.manager.send({method:n.setter,params:[t]})}),Object.defineProperty(t,n.name,e)})},p=function(t,n,e,r){g.manager.startPolling({method:t,params:[n]},n,e,r)},m=function(t){g.manager.stopPolling(t)},h={startPolling:p.bind(null,"eth_changed"),stopPolling:m},d={startPolling:p.bind(null,"shh_changed"),stopPolling:m},g={manager:f(),providers:{},toAscii:u.toAscii,fromAscii:u.fromAscii,toDecimal:function(t){return t=t.length>2?t.substring(2):"0",new BigNumber(t,16).toString(10)},fromDecimal:function(t){return"0x"+new BigNumber(t).toString(16)},toEth:u.toEth,eth:{contractFromAbi:function(t){return function(n){n=n||"0xc6d9d2cd449a754c494264e1809c50e34d64562b";var e=g.eth.contract(n,t);return e.address=n,e}},canary:function(){return function(t){return t=t||"0xc6d9d2cd449a754c494264e1809c50e34d64562b"}},watch:function(t,n,e,r){return t._isEvent?t(n,e):i(t,h,r)}},db:{},shh:{watch:function(t){return i(t,d)}},setProvider:function(t){g.manager.setProvider(t)},reset:function(){g.manager.reset()}};c(g,s()),c(g.eth,e.methods()),l(g.eth,e.properties()),c(g.db,r.methods()),c(g.shh,o.methods()),c(h,a.eth()),c(d,a.shh()),n.exports=g},{"./db":4,"./eth":5,"./filter":7,"./requestmanager":12,"./shh":13,"./utils":16,"./watches":17}],web3:[function(t,n){var e=t("./lib/web3");e.providers.HttpSyncProvider=t("./lib/httpsync"),e.providers.QtSyncProvider=t("./lib/qtsync"),e.eth.contract=t("./lib/contract"),e.abi=t("./lib/abi"),n.exports=e},{"./lib/abi":1,"./lib/contract":3,"./lib/httpsync":9,"./lib/qtsync":11,"./lib/web3":18}]},{},["web3"]);
\ No newline at end of file
+require=function t(e,n,r){function o(a,u){if(!n[a]){if(!e[a]){var s="function"==typeof require&&require;if(!u&&s)return s(a,!0);if(i)return i(a,!0);var c=new Error("Cannot find module '"+a+"'");throw c.code="MODULE_NOT_FOUND",c}var l=n[a]={exports:{}};e[a][0].call(l.exports,function(t){var n=e[a][1][t];return o(n?n:t)},l,l.exports,t,e,n,r)}return n[a].exports}for(var i="function"==typeof require&&require,a=0;a<r.length;a++)o(r[a]);return o}({1:[function(t,e){var n=t("../utils/utils"),r=t("../utils/config"),o=t("./types"),i=t("./formatters"),a=function(t){throw new Error("parser does not support type: "+t)},u=function(t){return"[]"===t.slice(-2)},s=function(t,e){return u(t)||"bytes"===t?i.formatInputInt(e.length):""},c=o.inputTypes(),l=function(t,e){var n="",r="",o="";return t.forEach(function(t,r){n+=s(t.type,e[r])}),t.forEach(function(n,i){for(var s=!1,l=0;l<c.length&&!s;l++)s=c[l].type(t[i].type,e[i]);s||a(t[i].type);var f=c[l-1].format;u(t[i].type)?o+=e[i].reduce(function(t,e){return t+f(e)},""):"bytes"===t[i].type?o+=f(e[i]):r+=f(e[i])}),n+=r+o},f=function(t){return u(t)||"bytes"===t?2*r.ETH_PADDING:0},p=o.outputTypes(),m=function(t,e){e=e.slice(2);var n=[],s=2*r.ETH_PADDING,c=t.reduce(function(t,e){return t+f(e.type)},0),l=e.slice(0,c);return e=e.slice(c),t.forEach(function(r,c){for(var f=!1,m=0;m<p.length&&!f;m++)f=p[m].type(t[c].type);f||a(t[c].type);var d=p[m-1].format;if(u(t[c].type)){var h=i.formatOutputUInt(l.slice(0,s));l=l.slice(s);for(var g=[],y=0;h>y;y++)g.push(d(e.slice(0,s))),e=e.slice(s);n.push(g)}else o.prefixedType("bytes")(t[c].type)?(l=l.slice(s),n.push(d(e.slice(0,s))),e=e.slice(s)):(n.push(d(e.slice(0,s))),e=e.slice(s))}),n},d=function(t){var e={};return t.forEach(function(t){var r=n.extractDisplayName(t.name),o=n.extractTypeName(t.name),i=function(){var e=Array.prototype.slice.call(arguments);return l(t.inputs,e)};void 0===e[r]&&(e[r]=i),e[r][o]=i}),e},h=function(t){var e={};return t.forEach(function(t){var r=n.extractDisplayName(t.name),o=n.extractTypeName(t.name),i=function(e){return m(t.outputs,e)};void 0===e[r]&&(e[r]=i),e[r][o]=i}),e};e.exports={inputParser:d,outputParser:h,formatInput:l,formatOutput:m}},{"../utils/config":4,"../utils/utils":5,"./formatters":2,"./types":3}],2:[function(t,e){var n=t("../utils/utils"),r=t("../utils/config"),o=function(t,e,n){return new Array(e-t.length+1).join(n?n:"0")+t},i=function(t){var e=2*r.ETH_PADDING;return BigNumber.config(r.ETH_BIGNUMBER_ROUNDING_MODE),o(n.toTwosComplement(t).round().toString(16),e)},a=function(t){return n.fromAscii(t,r.ETH_PADDING).substr(2)},u=function(t){return"000000000000000000000000000000000000000000000000000000000000000"+(t?"1":"0")},s=function(t){return i(new BigNumber(t).times(new BigNumber(2).pow(128)))},c=function(t){return"1"===new BigNumber(t.substr(0,1),16).toString(2).substr(0,1)},l=function(t){return t=t||"0",c(t)?new BigNumber(t,16).minus(new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",16)).minus(1):new BigNumber(t,16)},f=function(t){return t=t||"0",new BigNumber(t,16)},p=function(t){return l(t).dividedBy(new BigNumber(2).pow(128))},m=function(t){return f(t).dividedBy(new BigNumber(2).pow(128))},d=function(t){return"0x"+t},h=function(t){return"0000000000000000000000000000000000000000000000000000000000000001"===t?!0:!1},g=function(t){return n.toAscii(t)},y=function(t){return"0x"+t.slice(t.length-40,t.length)};e.exports={formatInputInt:i,formatInputString:a,formatInputBool:u,formatInputReal:s,formatOutputInt:l,formatOutputUInt:f,formatOutputReal:p,formatOutputUReal:m,formatOutputHash:d,formatOutputBool:h,formatOutputString:g,formatOutputAddress:y}},{"../utils/config":4,"../utils/utils":5}],3:[function(t,e){var n=t("./formatters"),r=function(t){return function(e){return 0===e.indexOf(t)}},o=function(t){return function(e){return t===e}},i=function(){return[{type:r("uint"),format:n.formatInputInt},{type:r("int"),format:n.formatInputInt},{type:r("bytes"),format:n.formatInputString},{type:r("real"),format:n.formatInputReal},{type:r("ureal"),format:n.formatInputReal},{type:o("address"),format:n.formatInputInt},{type:o("bool"),format:n.formatInputBool}]},a=function(){return[{type:r("uint"),format:n.formatOutputUInt},{type:r("int"),format:n.formatOutputInt},{type:r("bytes"),format:n.formatOutputString},{type:r("real"),format:n.formatOutputReal},{type:r("ureal"),format:n.formatOutputUReal},{type:o("address"),format:n.formatOutputAddress},{type:o("bool"),format:n.formatOutputBool}]};e.exports={prefixedType:r,namedType:o,inputTypes:i,outputTypes:a}},{"./formatters":2}],4:[function(t,e){var n=["wei","Kwei","Mwei","Gwei","szabo","finney","ether","grand","Mether","Gether","Tether","Pether","Eether","Zether","Yether","Nether","Dether","Vether","Uether"];e.exports={ETH_PADDING:32,ETH_SIGNATURE_LENGTH:4,ETH_UNITS:n,ETH_BIGNUMBER_ROUNDING_MODE:{ROUNDING_MODE:BigNumber.ROUND_DOWN},ETH_POLLING_TIMEOUT:1e3,ETH_DEFAULTBLOCK:"latest"}},{}],5:[function(t,e){var n={wei:"1",kwei:"1000",ada:"1000",mwei:"1000000",babbage:"1000000",gwei:"1000000000",shannon:"1000000000",szabo:"1000000000000",finney:"1000000000000000",ether:"1000000000000000000",kether:"1000000000000000000000",grand:"1000000000000000000000",einstein:"1000000000000000000000",mether:"1000000000000000000000000",gether:"1000000000000000000000000000",tether:"1000000000000000000000000000000"},r=function(t,e){for(var n=!1,r=0;r<t.length&&!n;r++)n=e(t[r]);return n?r-1:-1},o=function(t){var e="",n=0,r=t.length;for("0x"===t.substring(0,2)&&(n=2);r>n;n+=2){var o=parseInt(t.substr(n,2),16);if(0===o)break;e+=String.fromCharCode(o)}return e},i=function(t){for(var e="",n=0;n<t.length;n++){var r=t.charCodeAt(n).toString(16);e+=r.length<2?"0"+r:r}return e},a=function(t,e){e=void 0===e?0:e;for(var n=i(t);n.length<2*e;)n+="00";return"0x"+n},u=function(t){var e=t.indexOf("(");return-1!==e?t.substr(0,e):t},s=function(t){var e=t.indexOf("(");return-1!==e?t.substr(e+1,t.length-1-(e+1)).replace(" ",""):""},c=function(t){return t.filter(function(t){return"function"===t.type})},l=function(t){return t.filter(function(t){return"event"===t.type})},f=function(t){return y(t).toNumber()},p=function(t){var e=y(t),n=e.toString(16);return e.lessThan(0)?"-0x"+n.substr(1):"0x"+n},m=function(t){if(B(t))return t;if(w(t))return p(t);if(T(t))return a(JSON.stringify(t));if(x(t)){if(0===t.indexOf("-0x"))return p(t);if(!isFinite(t))return a(t)}return p(t)},d=function(t){t=t?t.toLowerCase():"ether";var e=n[t];if(void 0===e)throw new Error("This unit doesn't exists, please use the one of the following units"+JSON.stringify(n,null,2));return new BigNumber(e,10)},h=function(t,e){var n=y(t).dividedBy(d(e));return w(t)?n:n.toString(10)},g=function(t,e){var n=y(t).times(d(e));return w(t)?n:n.toString(10)},y=function(t){return t=t||0,w(t)?t:!x(t)||0!==t.indexOf("0x")&&0!==t.indexOf("-0x")?new BigNumber(t.toString(10),10):new BigNumber(t.replace("0x",""),16)},b=function(t){var e=y(t);return e.lessThan(0)?new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",16).plus(e).plus(1):e},v=function(t){return x(t)?0===t.indexOf("0x")&&42===t.length||-1===t.indexOf("0x")&&40===t.length:!1},w=function(t){return t instanceof BigNumber||t&&t.constructor&&"BigNumber"===t.constructor.name},x=function(t){return"string"==typeof t||t&&t.constructor&&"String"===t.constructor.name},_=function(t){return"function"==typeof t},T=function(t){return"object"==typeof t},B=function(t){return"boolean"==typeof t},F=function(t){return t instanceof Array};e.exports={findIndex:r,toHex:m,toDecimal:f,fromDecimal:p,toAscii:o,fromAscii:a,extractDisplayName:u,extractTypeName:s,filterFunctions:c,filterEvents:l,toWei:g,fromWei:h,toBigNumber:y,toTwosComplement:b,isBigNumber:w,isAddress:v,isFunction:_,isString:x,isObject:T,isBoolean:B,isArray:F}},{}],6:[function(t,e){var n=t("../version.json"),r=t("./web3/net"),o=t("./web3/eth"),i=t("./web3/db"),a=t("./web3/shh"),u=t("./web3/watches"),s=t("./web3/filter"),c=t("./utils/utils"),l=t("./solidity/formatters"),f=t("./web3/requestmanager"),p=t("./utils/config"),m=[{name:"sha3",call:"web3_sha3",inputFormatter:c.toHex}],d=[{name:"version.client",getter:"web3_clientVersion"},{name:"version.network",getter:"net_version"}],h=function(t,e){e.forEach(function(e){var n=e.name.split("."),r=function(){var t=null,n=Array.prototype.slice.call(arguments),r="function"==typeof e.call?e.call(n):e.call;return"function"==typeof n[n.length-1]&&(t=n[n.length-1],Array.prototype.pop.call(n)),e.addDefaultblock&&(n.length!==e.addDefaultblock?Array.prototype.push.call(n,isFinite(p.ETH_DEFAULTBLOCK)?c.fromDecimal(p.ETH_DEFAULTBLOCK):p.ETH_DEFAULTBLOCK):n[n.length-1]=isFinite(n[n.length-1])?c.fromDecimal(n[n.length-1]):n[n.length-1]),e.newMethod&&console.warn("This method is deprecated please use web3."+e.newMethod+"() instead."),x.manager.send({method:r,params:n,outputFormatter:e.outputFormatter,inputFormatter:e.inputFormatter,addDefaultblock:e.addDefaultblock},t)};n.length>1?(t[n[0]]||(t[n[0]]={}),t[n[0]][n[1]]=r):t[n[0]]=r})},g=function(t,e){e.forEach(function(e){var n=e.name.split("."),r={};r.get=function(){return e.newProperty&&console.warn("This property is deprecated please use web3."+e.newProperty+" instead."),x.manager.send({method:e.getter,outputFormatter:e.outputFormatter})},e.setter&&(r.set=function(t){return e.newProperty&&console.warn("This property is deprecated please use web3."+e.newProperty+" instead."),x.manager.send({method:e.setter,params:[t],inputFormatter:e.inputFormatter})}),r.enumerable=!e.newProperty,n.length>1?(t[n[0]]||(t[n[0]]={}),Object.defineProperty(t[n[0]],n[1],r)):Object.defineProperty(t,e.name,r)})},y=function(t,e,n,r){x.manager.startPolling({method:t,params:[e]},e,n,r)},b=function(t){x.manager.stopPolling(t)},v={startPolling:y.bind(null,"eth_getFilterChanges"),stopPolling:b},w={startPolling:y.bind(null,"shh_getFilterChanges"),stopPolling:b},x={version:{api:n.version},manager:f(),providers:{},setProvider:function(t){x.manager.setProvider(t)},reset:function(){x.manager.reset()},toHex:c.toHex,toAscii:c.toAscii,fromAscii:c.fromAscii,toDecimal:c.toDecimal,fromDecimal:c.fromDecimal,toBigNumber:c.toBigNumber,toWei:c.toWei,fromWei:c.fromWei,isAddress:c.isAddress,net:{},eth:{contractFromAbi:function(t){return console.warn("Initiating a contract like this is deprecated please use var MyContract = eth.contract(abi); new MyContract(address); instead."),function(e){e=e||"0xc6d9d2cd449a754c494264e1809c50e34d64562b";var n=x.eth.contract(e,t);return n.address=e,n}},filter:function(t,e,n){return t._isEvent?t(e,n):s(t,v,l.outputLogFormatter)},watch:function(t,e,n){return console.warn("eth.watch() is deprecated please use eth.filter() instead."),this.filter(t,e,n)}},db:{},shh:{filter:function(t){return s(t,w,l.outputPostFormatter)},watch:function(t){return console.warn("shh.watch() is deprecated please use shh.filter() instead."),this.filter(t)}}};Object.defineProperty(x.eth,"defaultBlock",{get:function(){return p.ETH_DEFAULTBLOCK},set:function(t){return p.ETH_DEFAULTBLOCK=t,p.ETH_DEFAULTBLOCK}}),h(x,m),g(x,d),h(x.net,r.methods),g(x.net,r.properties),h(x.eth,o.methods),g(x.eth,o.properties),h(x.db,i.methods()),h(x.shh,a.methods()),h(v,u.eth()),h(w,u.shh()),e.exports=x},{"../version.json":21,"./solidity/formatters":2,"./utils/config":4,"./utils/utils":5,"./web3/db":8,"./web3/eth":9,"./web3/filter":11,"./web3/net":15,"./web3/requestmanager":17,"./web3/shh":18,"./web3/watches":20}],7:[function(t,e){function n(t,e){t.forEach(function(t){if(-1===t.name.indexOf("(")){var e=t.name,n=t.inputs.map(function(t){return t.type}).join();t.name=e+"("+n+")"}});var n={};return c(n),l(n,t,e),f(n,t,e),p(n,t,e),n}var r=t("../web3"),o=t("../solidity/abi"),i=t("../utils/utils"),a=t("./event"),u=t("./signature"),s=function(t){r._currentContractAbi=t.abi,r._currentContractAddress=t.address,r._currentContractMethodName=t.method,r._currentContractMethodParams=t.params},c=function(t){t.call=function(e){return t._isTransaction=!1,t._options=e,t},t.sendTransaction=function(e){return t._isTransaction=!0,t._options=e,t},t.transact=function(e){return console.warn("myContract.transact() is deprecated please use myContract.sendTransaction() instead."),t.sendTransaction(e)},t._options={},["gas","gasPrice","value","from"].forEach(function(e){t[e]=function(n){return t._options[e]=n,t}})},l=function(t,e,n){var a=o.inputParser(e),c=o.outputParser(e);i.filterFunctions(e).forEach(function(o){var l=i.extractDisplayName(o.name),f=i.extractTypeName(o.name),p=function(){var i=Array.prototype.slice.call(arguments),p=u.functionSignatureFromAscii(o.name),m=a[l][f].apply(null,i),d=t._options||{};d.to=n,d.data=p+m;var h=t._isTransaction===!0||t._isTransaction!==!1&&!o.constant,g=d.collapse!==!1;if(t._options={},t._isTransaction=null,h)return s({abi:e,address:n,method:o.name,params:i}),void r.eth.sendTransaction(d);var y=r.eth.call(d),b=c[l][f](y);return g&&(1===b.length?b=b[0]:0===b.length&&(b=null)),b};void 0===t[l]&&(t[l]=p),t[l][f]=p})},f=function(t,e,n){t.address=n,t._onWatchEventResult=function(t){var n=event.getMatchingEvent(i.filterEvents(e)),r=a.outputParser(n);return r(t)},Object.defineProperty(t,"topics",{get:function(){return i.filterEvents(e).map(function(t){return u.eventSignatureFromAscii(t.name)})}})},p=function(t,e,n){i.filterEvents(e).forEach(function(e){var o=function(){var t=Array.prototype.slice.call(arguments),o=u.eventSignatureFromAscii(e.name),i=a.inputParser(n,o,e),s=i.apply(null,t),c=function(t){var n=a.outputParser(e);return n(t)};return r.eth.filter(s,void 0,void 0,c)};o._isEvent=!0;var s=i.extractDisplayName(e.name),c=i.extractTypeName(e.name);void 0===t[s]&&(t[s]=o),t[s][c]=o})},m=function(t){return t instanceof Array&&1===arguments.length?n.bind(null,t):(console.warn("Initiating a contract like this is deprecated please use var MyContract = eth.contract(abi); new MyContract(address); instead."),new n(arguments[1],arguments[0]))};e.exports=m},{"../solidity/abi":1,"../utils/utils":5,"../web3":6,"./event":10,"./signature":19}],8:[function(t,e){var n=function(){return[{name:"putString",call:"db_putString"},{name:"getString",call:"db_getString"},{name:"putHex",call:"db_putHex"},{name:"getHex",call:"db_getHex"}]};e.exports={methods:n}},{}],9:[function(t,e){var n=t("./formatters"),r=t("../utils/utils"),o=function(t){return r.isString(t[0])&&0===t[0].indexOf("0x")?"eth_getBlockByHash":"eth_getBlockByNumber"},i=function(t){return r.isString(t[0])&&0===t[0].indexOf("0x")?"eth_getTransactionByBlockHashAndIndex":"eth_getTransactionByBlockNumberAndIndex"},a=function(t){return r.isString(t[0])&&0===t[0].indexOf("0x")?"eth_getUncleByBlockHashAndIndex":"eth_getUncleByBlockNumberAndIndex"},u=function(t){return r.isString(t[0])&&0===t[0].indexOf("0x")?"eth_getBlockTransactionCountByHash":"eth_getBlockTransactionCountByNumber"},s=function(t){return r.isString(t[0])&&0===t[0].indexOf("0x")?"eth_getUncleCountByBlockHash":"eth_getUncleCountByBlockNumber"},c=[{name:"getBalance",call:"eth_getBalance",addDefaultblock:2,outputFormatter:n.convertToBigNumber},{name:"getStorage",call:"eth_getStorage",addDefaultblock:2},{name:"getStorageAt",call:"eth_getStorageAt",addDefaultblock:3,inputFormatter:r.toHex},{name:"getData",call:"eth_getData",addDefaultblock:2},{name:"getBlock",call:o,outputFormatter:n.outputBlockFormatter,inputFormatter:[r.toHex,function(t){return t?!0:!1}]},{name:"getUncle",call:a,outputFormatter:n.outputBlockFormatter,inputFormatter:[r.toHex,r.toHex,function(t){return t?!0:!1}]},{name:"getCompilers",call:"eth_getCompilers"},{name:"getBlockTransactionCount",call:u,outputFormatter:r.toDecimal,inputFormatter:r.toHex},{name:"getBlockUncleCount",call:s,outputFormatter:r.toDecimal,inputFormatter:r.toHex},{name:"getTransaction",call:"eth_getTransactionByHash",outputFormatter:n.outputTransactionFormatter},{name:"getTransactionFromBlock",call:i,outputFormatter:n.outputTransactionFormatter,inputFormatter:r.toHex},{name:"getTransactionCount",call:"eth_getTransactionCount",addDefaultblock:2,outputFormatter:r.toDecimal},{name:"sendTransaction",call:"eth_sendTransaction",inputFormatter:n.inputTransactionFormatter},{name:"call",call:"eth_call",addDefaultblock:2,inputFormatter:n.inputCallFormatter},{name:"compile.solidity",call:"eth_compileSolidity"},{name:"compile.lll",call:"eth_compileLLL",inputFormatter:r.toHex},{name:"compile.serpent",call:"eth_compileSerpent",inputFormatter:r.toHex},{name:"flush",call:"eth_flush"},{name:"balanceAt",call:"eth_balanceAt",newMethod:"eth.getBalance"},{name:"stateAt",call:"eth_stateAt",newMethod:"eth.getStorageAt"},{name:"storageAt",call:"eth_storageAt",newMethod:"eth.getStorage"},{name:"countAt",call:"eth_countAt",newMethod:"eth.getTransactionCount"},{name:"codeAt",call:"eth_codeAt",newMethod:"eth.getData"},{name:"transact",call:"eth_transact",newMethod:"eth.sendTransaction"},{name:"block",call:o,newMethod:"eth.getBlock"},{name:"transaction",call:i,newMethod:"eth.getTransaction"},{name:"uncle",call:a,newMethod:"eth.getUncle"},{name:"compilers",call:"eth_compilers",newMethod:"eth.getCompilers"},{name:"solidity",call:"eth_solidity",newMethod:"eth.compile.solidity"},{name:"lll",call:"eth_lll",newMethod:"eth.compile.lll"},{name:"serpent",call:"eth_serpent",newMethod:"eth.compile.serpent"},{name:"transactionCount",call:u,newMethod:"eth.getBlockTransactionCount"},{name:"uncleCount",call:s,newMethod:"eth.getBlockUncleCount"},{name:"logs",call:"eth_logs"}],l=[{name:"coinbase",getter:"eth_coinbase"},{name:"mining",getter:"eth_mining"},{name:"gasPrice",getter:"eth_gasPrice",outputFormatter:n.convertToBigNumber},{name:"accounts",getter:"eth_accounts"},{name:"blockNumber",getter:"eth_blockNumber",outputFormatter:r.toDecimal},{name:"listening",getter:"net_listening",setter:"eth_setListening",newProperty:"net.listening"},{name:"peerCount",getter:"net_peerCount",newProperty:"net.peerCount"},{name:"number",getter:"eth_number",newProperty:"eth.blockNumber"}];e.exports={methods:c,properties:l}},{"../utils/utils":5,"./formatters":12}],10:[function(t,e){var n=t("../solidity/abi"),r=t("../utils/utils"),o=t("./signature"),i=function(t,e){return t.filter(function(t){return t.indexed===e})},a=function(t,e){var n=r.findIndex(t,function(t){return t.name===e});return-1===n?void console.error("indexed param with name "+e+" not found"):t[n]},u=function(t,e){return Object.keys(e).map(function(r){var o=[a(i(t.inputs,!0),r)],u=e[r];return u instanceof Array?u.map(function(t){return n.formatInput(o,[t])}):n.formatInput(o,[u])})},s=function(t,e,n){return function(r,o){var i=o||{};return i.address=t,i.topics=[],i.topics.push(e),r&&(i.topics=i.topics.concat(u(n,r))),i}},c=function(t,e,n){var r=e.slice(),o=n.slice();return t.reduce(function(t,e){var n;return n=e.indexed?r.splice(0,1)[0]:o.splice(0,1)[0],t[e.name]=n,t},{})},l=function(t){return function(e){var o={event:r.extractDisplayName(t.name),number:e.number,hash:e.hash,args:{}};if(e.topics=e.topic,!e.topics)return o;var a=i(t.inputs,!0),u="0x"+e.topics.slice(1,e.topics.length).map(function(t){return t.slice(2)}).join(""),s=n.formatOutput(a,u),l=i(t.inputs,!1),f=n.formatOutput(l,e.data);return o.args=c(t.inputs,s,f),o}},f=function(t,e){for(var n=0;n<t.length;n++){var r=o.eventSignatureFromAscii(t[n].name);if(r===e.topics[0])return t[n]}return void 0};e.exports={inputParser:s,outputParser:l,getMatchingEvent:f}},{"../solidity/abi":1,"../utils/utils":5,"./signature":19}],11:[function(t,e){var n=t("../utils/utils"),r=function(t){return!!t&&"function"==typeof t.newFilter&&"function"==typeof t.getLogs&&"function"==typeof t.uninstallFilter&&"function"==typeof t.startPolling&&"function"==typeof t.stopPolling},o=function(t){return"string"==typeof t?t:(t=t||{},t.topic&&(console.warn('"topic" is deprecated, is "topics" instead'),t.topics=t.topic),t.earliest&&(console.warn('"earliest" is deprecated, is "fromBlock" instead'),t.fromBlock=t.earliest),t.latest&&(console.warn('"latest" is deprecated, is "toBlock" instead'),t.toBlock=t.latest),t.skip&&(console.warn('"skip" is deprecated, is "offset" instead'),t.offset=t.skip),t.max&&(console.warn('"max" is deprecated, is "limit" instead'),t.limit=t.max),t.topics instanceof Array&&(t.topics=t.topics.map(function(t){return n.toHex(t)})),{fromBlock:n.toHex(t.fromBlock),toBlock:n.toHex(t.toBlock),limit:n.toHex(t.limit),offset:n.toHex(t.offset),to:t.to,address:t.address,topics:t.topics})},i=function(t,e,i){if(!r(e))return void console.error("filter implemenation is invalid");t=o(t);var a=[],u=e.newFilter(t),s=function(t){t.forEach(function(t){t=i?i(t):t,a.forEach(function(e){e(t)})})};e.startPolling(u,s,e.uninstallFilter);var c=function(t){a.push(t)},l=function(){e.stopPolling(u),e.uninstallFilter(u),a=[]},f=function(){var t=e.getLogs(u);return n.isArray(t)?t.map(function(t){return i?i(t):t}):t};return{watch:c,stopWatching:l,get:f,changed:function(){return console.warn("watch().changed() is deprecated please use filter().watch() instead."),c.apply(this,arguments)},arrived:function(){return console.warn("watch().arrived() is deprecated please use filter().watch() instead."),c.apply(this,arguments)},happened:function(){return console.warn("watch().happened() is deprecated please use filter().watch() instead."),c.apply(this,arguments)},uninstall:function(){return console.warn("watch().uninstall() is deprecated please use filter().stopWatching() instead."),l.apply(this,arguments)},messages:function(){return console.warn("watch().messages() is deprecated please use filter().get() instead."),f.apply(this,arguments)},logs:function(){return console.warn("watch().logs() is deprecated please use filter().get() instead."),f.apply(this,arguments)}}};e.exports=i},{"../utils/utils":5}],12:[function(t,e){var n=t("../utils/utils"),r=function(t){return n.toBigNumber(t)},o=function(t){return t.code&&(t.data=t.code,delete t.code),["gasPrice","gas","value"].forEach(function(e){t[e]=n.fromDecimal(t[e])}),t},i=function(t){return t.gas=n.toDecimal(t.gas),t.gasPrice=n.toBigNumber(t.gasPrice),t.value=n.toBigNumber(t.value),t},a=function(t){return t.code&&(t.data=t.code,delete t.code),t},u=function(t){return t.gasLimit=n.toDecimal(t.gasLimit),t.gasUsed=n.toDecimal(t.gasUsed),t.size=n.toDecimal(t.size),t.timestamp=n.toDecimal(t.timestamp),t.number=n.toDecimal(t.number),t.minGasPrice=n.toBigNumber(t.minGasPrice),t.difficulty=n.toBigNumber(t.difficulty),t.totalDifficulty=n.toBigNumber(t.totalDifficulty),t.transactions instanceof Array&&t.transactions.forEach(function(t){return n.isString(t)?void 0:i(t)}),t},s=function(t){return t.blockNumber=n.toDecimal(t.blockNumber),t.transactionIndex=n.toDecimal(t.transactionIndex),t.logIndex=n.toDecimal(t.logIndex),t},c=function(t){return t.payload=n.toHex(t.payload),t.ttl=n.fromDecimal(t.ttl),t.priority=n.fromDecimal(t.priority),t.topics instanceof Array||(t.topics=[t.topics]),t.topics=t.topics.map(function(t){return n.fromAscii(t)}),t},l=function(t){if(t.expiry=n.toDecimal(t.expiry),t.sent=n.toDecimal(t.sent),t.ttl=n.toDecimal(t.ttl),t.workProved=n.toDecimal(t.workProved),t.payloadRaw=t.payload,t.payload=n.toAscii(t.payload),0===t.payload.indexOf("{")||0===t.payload.indexOf("["))try{t.payload=JSON.parse(t.payload)}catch(e){}return t.topics=t.topics.map(function(t){return n.toAscii(t)}),t};e.exports={convertToBigNumber:r,inputTransactionFormatter:o,outputTransactionFormatter:i,inputCallFormatter:a,outputBlockFormatter:u,outputLogFormatter:s,inputPostFormatter:c,outputPostFormatter:l}},{"../utils/utils":5}],13:[function(t,e){var n=function(t){this.name="HTTP",this.handlers=[],this.host=t||"http://localhost:8080"};n.prototype.send=function(t,e){var n=new XMLHttpRequest;if("function"!=typeof e){if(n.open("POST",this.host,!1),n.send(JSON.stringify(t)),200!==n.status)return;return JSON.parse(n.responseText)}n.onreadystatechange=function(){if(4===n.readyState){var t="";try{t=JSON.parse(n.responseText)}catch(r){t=r}e(t,n.status)}},n.open("POST",this.host,!0),n.send(JSON.stringify(t))},e.exports=n},{}],14:[function(t,e){var n=1,r=function(t,e){return t||console.error("jsonrpc method should be specified!"),{jsonrpc:"2.0",method:t,params:e||[],id:n++}},o=function(t){return!!t&&!t.error&&"2.0"===t.jsonrpc&&"number"==typeof t.id&&void 0!==t.result},i=function(t){return t.map(function(t){return r(t.method,t.params)})};e.exports={toPayload:r,isValidResponse:o,toBatchPayload:i}},{}],15:[function(t,e){var n=t("../utils/utils"),r=[],o=[{name:"listening",getter:"net_listening"},{name:"peerCount",getter:"net_peerCount",outputFormatter:n.toDecimal}];e.exports={methods:r,properties:o}},{"../utils/utils":5}],16:[function(t,e){var n=function(){};n.prototype.send=function(t){var e=navigator.qt.callMethod(JSON.stringify(t));return JSON.parse(e)},e.exports=n},{}],17:[function(t,e){var n=t("./jsonrpc"),r=t("../utils/config"),o=function(){var t,e=[],o=null,i=function(e,r){"function"==typeof e.inputFormatter?e.params=Array.prototype.map.call(e.params,function(t,n){return!e.addDefaultblock||n+1<e.addDefaultblock?e.inputFormatter(t):t}):e.inputFormatter instanceof Array&&(e.params=Array.prototype.map.call(e.inputFormatter,function(t,n){return!e.addDefaultblock||n+1<e.addDefaultblock?t(e.params[n]):e.params[n]}));var o=n.toPayload(e.method,e.params);if(!t)return console.error("provider is not set"),null;if("function"!=typeof r||"HTTP"!==t.name){var i=t.send(o);return n.isValidResponse(i)?"function"==typeof e.outputFormatter?e.outputFormatter(i.result):i.result:("object"==typeof i&&i.error&&i.error.message&&console.error(i.error.message),null)}t.send(o,function(t,o){return n.isValidResponse(t)?void r(null,"function"==typeof e.outputFormatter?e.outputFormatter(t.result):t.result):("object"==typeof t&&t.error&&t.error.message?(console.error(t.error.message),r(t.error)):r(new Error({status:o,error:t,message:"Bad Request"})),null)})},a=function(e){t=e},u=function(t,n,r,o){e.push({data:t,id:n,callback:r,uninstall:o})},s=function(t){for(var n=e.length;n--;){var r=e[n];r.id===t&&e.splice(n,1)}},c=function(){e.forEach(function(t){t.uninstall(t.id)}),e=[],o&&(clearTimeout(o),o=null),l()},l=function(){e.forEach(function(t){i(t.data,function(e,n){n instanceof Array&&0!==n.length&&t.callback(n)})}),o=setTimeout(l,r.ETH_POLLING_TIMEOUT)};return l(),{send:i,setProvider:a,startPolling:u,stopPolling:s,reset:c}};e.exports=o},{"../utils/config":4,"./jsonrpc":14}],18:[function(t,e){var n=t("./formatters"),r=function(){return[{name:"post",call:"shh_post",inputFormatter:n.inputPostFormatter},{name:"newIdentity",call:"shh_newIdentity"},{name:"hasIdentity",call:"shh_hasIdentity"},{name:"newGroup",call:"shh_newGroup"},{name:"addToGroup",call:"shh_addToGroup"},{name:"haveIdentity",call:"shh_haveIdentity",newMethod:"shh.hasIdentity"}]};e.exports={methods:r}},{"./formatters":12}],19:[function(t,e){var n=t("../web3"),r=t("../utils/config"),o=function(t){return n.sha3(n.fromAscii(t)).slice(0,2+2*r.ETH_SIGNATURE_LENGTH)},i=function(t){return n.sha3(n.fromAscii(t))};e.exports={functionSignatureFromAscii:o,eventSignatureFromAscii:i}},{"../utils/config":4,"../web3":6}],20:[function(t,e){var n=function(){var t=function(t){return"string"==typeof t[0]?"eth_newBlockFilter":"eth_newFilter"};return[{name:"newFilter",call:t},{name:"uninstallFilter",call:"eth_uninstallFilter"},{name:"getLogs",call:"eth_getFilterLogs"}]},r=function(){return[{name:"newFilter",call:"shh_newFilter"},{name:"uninstallFilter",call:"shh_uninstallFilter"},{name:"getLogs",call:"shh_getMessages"}]};e.exports={eth:n,shh:r}},{}],21:[function(t,e){e.exports={version:"0.1.3"}},{}],web3:[function(t,e){var n=t("./lib/web3");n.providers.HttpProvider=t("./lib/web3/httpprovider"),n.providers.QtSyncProvider=t("./lib/web3/qtsync"),n.eth.contract=t("./lib/web3/contract"),n.abi=t("./lib/solidity/abi"),e.exports=n},{"./lib/solidity/abi":1,"./lib/web3":6,"./lib/web3/contract":7,"./lib/web3/httpprovider":13,"./lib/web3/qtsync":16}]},{},["web3"]);
\ No newline at end of file
diff --git a/libjsqrc/ethereumjs/example/balance.html b/libjsqrc/ethereumjs/example/balance.html
index 2d21e2720..0c2c4b8ef 100644
--- a/libjsqrc/ethereumjs/example/balance.html
+++ b/libjsqrc/ethereumjs/example/balance.html
@@ -7,19 +7,17 @@
 <script type="text/javascript">
    
     var web3 = require('web3');
-    web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8080'));
+    web3.setProvider(new web3.providers.HttpProvider());
 
     function watchBalance() {
         var coinbase = web3.eth.coinbase;
-        var originalBalance = 0;
 
-        var balance = web3.eth.balanceAt(coinbase);
-        var originalBalance = web3.toDecimal(balance);
-        document.getElementById('original').innerText = 'original balance: ' + originalBalance + '    watching...';
+        var originalBalance = web3.eth.getBalance(coinbase).toNumber();
+        document.getElementById('coinbase').innerText = 'coinbase: ' + coinbase;
+        document.getElementById('original').innerText = ' original balance: ' + originalBalance + '    watching...';
 
-        web3.eth.watch('pending').changed(function() {
-            balance = web3.eth.balanceAt(coinbase)
-            var currentBalance = web3.toDecimal(balance);
+        web3.eth.filter('pending').watch(function() {
+            var currentBalance = web3.eth.getBalance(coinbase).toNumber();
             document.getElementById("current").innerText = 'current: ' + currentBalance;
             document.getElementById("diff").innerText = 'diff:    ' + (currentBalance - originalBalance);
         });
@@ -31,6 +29,7 @@
     <h1>coinbase balance</h1>
     <button type="button" onClick="watchBalance();">watch balance</button>
     <div></div>
+    <div id="coinbase"></div>
     <div id="original"></div>
     <div id="current"></div>
     <div id="diff"></div>
diff --git a/libjsqrc/ethereumjs/example/contract.html b/libjsqrc/ethereumjs/example/contract.html
index a534f68d8..ce96d8d5c 100644
--- a/libjsqrc/ethereumjs/example/contract.html
+++ b/libjsqrc/ethereumjs/example/contract.html
@@ -7,7 +7,7 @@
 <script type="text/javascript">
 
     var web3 = require('web3');
-    web3.setProvider(new web3.providers.HttpSyncProvider());
+    web3.setProvider(new web3.providers.HttpProvider());
 
     // solidity source code
     var source = "" + 
@@ -35,7 +35,7 @@
         ]
     }];
 
-    var contract;
+    var myContract;
 
     function createExampleContract() {
         // hide create button
@@ -43,8 +43,10 @@
         document.getElementById('source').innerText = source;
 
         // create contract
-        var address = web3.eth.transact({code: web3.eth.solidity(source)});
-        contract = web3.eth.contract(address, desc);
+        var address = web3.eth.sendTransaction({data: web3.eth.compile.solidity(source)}),
+            Contract = web3.eth.contract(desc);
+
+        myContract = new Contract(address);
         document.getElementById('call').style.visibility = 'visible';
     }
 
@@ -53,7 +55,7 @@
         var param = parseInt(document.getElementById('value').value);
 
         // call the contract
-        var res = contract.call().multiply(param);
+        var res = myContract.call().multiply(param);
         document.getElementById('result').innerText = res.toString(10);
     }
 
diff --git a/libjsqrc/ethereumjs/example/contract_with_array.html b/libjsqrc/ethereumjs/example/contract_with_array.html
index a3dfc8a24..6d5f4de4a 100644
--- a/libjsqrc/ethereumjs/example/contract_with_array.html
+++ b/libjsqrc/ethereumjs/example/contract_with_array.html
@@ -7,7 +7,7 @@
 <script type="text/javascript">
 
     var web3 = require('web3');
-    web3.setProvider(new web3.providers.HttpSyncProvider());
+    web3.setProvider(new web3.providers.HttpProvider());
 
     // solidity source code
     var source = "" + 
@@ -35,7 +35,7 @@
         ]
     }];
 
-    var contract;
+    var myContract;
 
     function createExampleContract() {
         // hide create button
@@ -43,8 +43,10 @@
         document.getElementById('source').innerText = source;
 
         // create contract
-        var address = web3.eth.transact({code: web3.eth.solidity(source)});
-        contract = web3.eth.contract(address, desc);
+        var address = web3.eth.sendTransaction({data: web3.eth.compile.solidity(source)}),
+            Contract = web3.eth.contract(desc);
+
+        myContract = new Contract(address);
         document.getElementById('call').style.visibility = 'visible';
     }
 
@@ -54,7 +56,7 @@
         var param2 = parseInt(document.getElementById('value2').value);
 
         // call the contract
-        var res = contract.call().multiply([param, param2]);
+        var res = myContract.call().multiply([param, param2]);
         document.getElementById('result').innerText = res.toString(10);
     }
 
diff --git a/libjsqrc/ethereumjs/example/event.html b/libjsqrc/ethereumjs/example/event.html
index 84d302437..8f208c8fe 100644
--- a/libjsqrc/ethereumjs/example/event.html
+++ b/libjsqrc/ethereumjs/example/event.html
@@ -5,7 +5,7 @@
     <script type="text/javascript" src="../dist/ethereum.js"></script>
     <script type="text/javascript">
         var web3 = require('web3');
-        web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8080'));
+        web3.setProvider(new web3.providers.HttpProvider('http://localhost:8080'));
 
         var desc = [{
             "type":"event",
diff --git a/libjsqrc/ethereumjs/example/event_inc.html b/libjsqrc/ethereumjs/example/event_inc.html
index 17df9d681..6a7fc822b 100644
--- a/libjsqrc/ethereumjs/example/event_inc.html
+++ b/libjsqrc/ethereumjs/example/event_inc.html
@@ -5,7 +5,7 @@
     <script type="text/javascript" src="../dist/ethereum.js"></script>
     <script type="text/javascript">
         var web3 = require('web3');
-        web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8080'));
+        web3.setProvider(new web3.providers.HttpProvider('http://localhost:8080'));
 
         var source = "" + 
         "contract Contract { " +
@@ -39,7 +39,7 @@
         };
     
         var createContract = function () {
-            address = web3.eth.transact({code: web3.eth.solidity(source)});
+            address = web3.eth.sendTransaction({data: web3.eth.compile.solidity(source)});
             contract = web3.eth.contract(address, desc); 
             contract.Incremented({odd: true}).changed(update);
             
diff --git a/libjsqrc/ethereumjs/example/natspec_contract.html b/libjsqrc/ethereumjs/example/natspec_contract.html
index 212e582dc..bf76eafda 100644
--- a/libjsqrc/ethereumjs/example/natspec_contract.html
+++ b/libjsqrc/ethereumjs/example/natspec_contract.html
@@ -7,7 +7,7 @@
 <script type="text/javascript">
 
     var web3 = require('web3');
-    web3.setProvider(new web3.providers.QtSyncProvider());
+    web3.setProvider(new web3.providers.HttpProvider());
 
     // solidity source code
     var source = "" + 
@@ -44,7 +44,7 @@
         document.getElementById('source').innerText = source;
 
         // create contract
-        var address = web3.eth.transact({code: web3.eth.solidity(source)});
+        var address = web3.eth.sendTransaction({code: web3.eth.solidity(source)});
         contract = web3.eth.contract(address, desc);
         document.getElementById('call').style.visibility = 'visible';
     }
@@ -55,7 +55,7 @@
 
         // transaction does not return any result, cause it's not synchronous and we don't know,
         // when it will be processed
-        contract.transact().multiply(param);
+        contract.sendTransaction().multiply(param);
         document.getElementById('result').innerText = 'transaction made';
     }
 
diff --git a/libjsqrc/ethereumjs/example/node-app.js b/libjsqrc/ethereumjs/example/node-app.js
index 8c2fc0ba3..72b3986da 100644
--- a/libjsqrc/ethereumjs/example/node-app.js
+++ b/libjsqrc/ethereumjs/example/node-app.js
@@ -2,11 +2,11 @@
 
 var web3 = require("../index.js");
 
-web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8080'));
+web3.setProvider(new web3.providers.HttpProvider('http://localhost:8080'));
 
 var coinbase = web3.eth.coinbase;
 console.log(coinbase);
 
-var balance = web3.eth.balanceAt(coinbase);
+var balance = web3.eth.getBalance(coinbase);
 console.log(balance);
 
diff --git a/libjsqrc/ethereumjs/gulpfile.js b/libjsqrc/ethereumjs/gulpfile.js
index 3776508ce..57382414c 100644
--- a/libjsqrc/ethereumjs/gulpfile.js
+++ b/libjsqrc/ethereumjs/gulpfile.js
@@ -2,6 +2,7 @@
 
 'use strict';
 
+var version = require('./version.json');
 var path = require('path');
 
 var del = require('del');
@@ -14,6 +15,7 @@ var source = require('vinyl-source-stream');
 var exorcist = require('exorcist');
 var bower = require('bower');
 var streamify = require('gulp-streamify');
+var replace = require('gulp-replace');
 
 var DEST = './dist/';
 var src = 'index';
@@ -26,6 +28,15 @@ var browserifyOptions = {
     bundleExternal: false
 };
 
+gulp.task('versionReplace', function(){
+  gulp.src(['./package.json'])
+    .pipe(replace(/\"version\"\: \"(.{5})\"/, '"version": "'+ version.version + '"'))
+    .pipe(gulp.dest('./'));
+  gulp.src(['./package.js'])
+    .pipe(replace(/version\: \'(.{5})\'/, "version: '"+ version.version + "'"))
+    .pipe(gulp.dest('./'));
+});
+
 gulp.task('bower', function(cb){
     bower.commands.install().on('end', function (installed){
         console.log(installed);
@@ -47,8 +58,6 @@ gulp.task('build', ['clean'], function () {
     return browserify(browserifyOptions)
         .require('./' + src + '.js', {expose: 'web3'})
         .add('./' + src + '.js')
-        .transform('envify', { NODE_ENV: 'build' })
-        .transform('unreachable-branch-transform')
         .bundle()
         .pipe(exorcist(path.join( DEST, dst + '.js.map')))
         .pipe(source(dst + '.js'))
@@ -62,6 +71,9 @@ gulp.task('watch', function() {
     gulp.watch(['./lib/*.js'], ['lint', 'build']);
 });
 
-gulp.task('dev', ['bower', 'lint', 'build']);
+gulp.task('dev', ['versionReplace','bower', 'lint', 'build']);
 gulp.task('default', ['dev']);
 
+
+gulp.task('version', ['versionReplace']);
+
diff --git a/libjsqrc/ethereumjs/index.js b/libjsqrc/ethereumjs/index.js
index 67c500fb7..97e8e315d 100644
--- a/libjsqrc/ethereumjs/index.js
+++ b/libjsqrc/ethereumjs/index.js
@@ -1,7 +1,7 @@
 var web3 = require('./lib/web3');
-web3.providers.HttpSyncProvider = require('./lib/httpsync');
-web3.providers.QtSyncProvider = require('./lib/qtsync');
-web3.eth.contract = require('./lib/contract');
-web3.abi = require('./lib/abi');
+web3.providers.HttpProvider = require('./lib/web3/httpprovider');
+web3.providers.QtSyncProvider = require('./lib/web3/qtsync');
+web3.eth.contract = require('./lib/web3/contract');
+web3.abi = require('./lib/solidity/abi');
 
 module.exports = web3;
diff --git a/libjsqrc/ethereumjs/karma.conf.js b/libjsqrc/ethereumjs/karma.conf.js
new file mode 100644
index 000000000..92e390cff
--- /dev/null
+++ b/libjsqrc/ethereumjs/karma.conf.js
@@ -0,0 +1,96 @@
+// Karma configuration
+// Generated on Thu Feb 19 2015 19:57:47 GMT+0100 (W. Europe Standard Time)
+
+module.exports = function (config) {
+    config.set({
+
+        // base path that will be used to resolve all patterns (eg. files, exclude)
+        basePath: '',
+
+        // level of logging
+        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+        
+        // Continuous Integration mode
+        // if true, Karma captures browsers, runs the tests and exits
+        singleRun: true,    logLevel: config.LOG_INFO,
+        //singleRun: true,    logLevel: config.LOG_DEBUG,
+
+        // frameworks to use
+        // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+        frameworks: ['browserify', 'mocha'],
+
+
+        // list of files / patterns to load in the browser
+        files: [
+            'node_modules/bignumber.js/bignumber.js',
+            'test/*.js',
+        ],
+
+
+        // list of files to exclude
+        exclude: [
+        ],
+
+        client: {
+            mocha: {
+                //ui: 'tdd'
+                timeout: 5000           // especially for the post requests
+            }
+        },
+        browserify: {
+            bundleDelay: 750,
+            debug: true
+                //     transform: [],
+                //     //extensions: ['.js']
+        },
+
+        // preprocess matching files before serving them to the browser
+        // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+        preprocessors: {
+            'test/*.js': ['browserify']
+        },
+
+
+        // test results reporter to use
+        // possible values: 'dots', 'progress'
+        // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+        reporters: ['dots'],
+
+
+        // web server port
+        port: 9876,
+
+
+        // enable / disable colors in the output (reporters and logs)
+        colors: true,
+
+
+        // enable / disable watching file and executing tests whenever any file changes
+        autoWatch: true,
+
+
+        // start these browsers
+        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+        // // Chrome
+        // // PhantomJS
+        browsers: ['Chrome', 'Safari', 'Firefox'],
+        browserNoActivityTimeout: 10000,
+        browserDisconnectTimeout: 5000,
+
+        customLaunchers: {
+            chromeWithoutSecurity: {
+                base: 'Chrome',
+                flags: ['--disable-web-security']
+            },
+
+            IE9: {
+                base: 'IE',
+                'x-ua-compatible': 'IE=EmulateIE9'
+            },
+            IE8: {
+                base: 'IE',
+                'x-ua-compatible': 'IE=EmulateIE8'
+            }
+        }
+    });
+};
diff --git a/libjsqrc/ethereumjs/lib/eth.js b/libjsqrc/ethereumjs/lib/eth.js
deleted file mode 100644
index 58ed5fa11..000000000
--- a/libjsqrc/ethereumjs/lib/eth.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-    This file is part of ethereum.js.
-
-    ethereum.js is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ethereum.js 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 Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file eth.js
- * @authors:
- *   Marek Kotewicz <marek@ethdev.com>
- * @date 2015
- */
-
-/// @returns an array of objects describing web3.eth api methods
-var methods = function () {
-    var blockCall = function (args) {
-        return typeof args[0] === "string" ? "eth_blockByHash" : "eth_blockByNumber";
-    };
-
-    var transactionCall = function (args) {
-        return typeof args[0] === "string" ? 'eth_transactionByHash' : 'eth_transactionByNumber';
-    };
-
-    var uncleCall = function (args) {
-        return typeof args[0] === "string" ? 'eth_uncleByHash' : 'eth_uncleByNumber';
-    };
-
-    var transactionCountCall = function (args) {
-        return typeof args[0] === "string" ? 'eth_transactionCountByHash' : 'eth_transactionCountByNumber';
-    };
-
-    var uncleCountCall = function (args) {
-        return typeof args[0] === "string" ? 'eth_uncleCountByHash' : 'eth_uncleCountByNumber';
-    };
-
-    return [
-    { name: 'balanceAt', call: 'eth_balanceAt' },
-    { name: 'stateAt', call: 'eth_stateAt' },
-    { name: 'storageAt', call: 'eth_storageAt' },
-    { name: 'countAt', call: 'eth_countAt'},
-    { name: 'codeAt', call: 'eth_codeAt' },
-    { name: 'transact', call: 'eth_transact' },
-    { name: 'call', call: 'eth_call' },
-    { name: 'block', call: blockCall },
-    { name: 'transaction', call: transactionCall },
-    { name: 'uncle', call: uncleCall },
-    { name: 'compilers', call: 'eth_compilers' },
-    { name: 'flush', call: 'eth_flush' },
-    { name: 'lll', call: 'eth_lll' },
-    { name: 'solidity', call: 'eth_solidity' },
-    { name: 'serpent', call: 'eth_serpent' },
-    { name: 'logs', call: 'eth_logs' },
-    { name: 'transactionCount', call: transactionCountCall },
-    { name: 'uncleCount', call: uncleCountCall }
-    ];
-};
-
-/// @returns an array of objects describing web3.eth api properties
-var properties = function () {
-    return [
-    { name: 'coinbase', getter: 'eth_coinbase', setter: 'eth_setCoinbase' },
-    { name: 'listening', getter: 'eth_listening', setter: 'eth_setListening' },
-    { name: 'mining', getter: 'eth_mining', setter: 'eth_setMining' },
-    { name: 'gasPrice', getter: 'eth_gasPrice' },
-    { name: 'accounts', getter: 'eth_accounts' },
-    { name: 'peerCount', getter: 'eth_peerCount' },
-    { name: 'defaultBlock', getter: 'eth_defaultBlock', setter: 'eth_setDefaultBlock' },
-    { name: 'number', getter: 'eth_number'}
-    ];
-};
-
-module.exports = {
-    methods: methods,
-    properties: properties
-};
-
diff --git a/libjsqrc/ethereumjs/lib/httpsync.js b/libjsqrc/ethereumjs/lib/httpsync.js
deleted file mode 100644
index b90fa746e..000000000
--- a/libjsqrc/ethereumjs/lib/httpsync.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-    This file is part of ethereum.js.
-
-    ethereum.js is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ethereum.js 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 Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file httpsync.js
- * @authors:
- *   Marek Kotewicz <marek@ethdev.com>
- *   Marian Oancea <marian@ethdev.com>
- * @date 2014
- */
-
-if (process.env.NODE_ENV !== 'build') {
-        var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line
-}
-
-var HttpSyncProvider = function (host) {
-    this.handlers = [];
-    this.host = host || 'http://127.0.0.1:8080';
-};
-
-HttpSyncProvider.prototype.send = function (payload) {
-    //var data = formatJsonRpcObject(payload);
-
-    var request = new XMLHttpRequest();
-    request.open('POST', this.host, false);
-    request.send(JSON.stringify(payload));
-
-    var result = request.responseText;
-    // check request.status
-    if(request.status !== 200)
-        return;
-    return JSON.parse(result);
-};
-
-module.exports = HttpSyncProvider;
-
diff --git a/libjsqrc/ethereumjs/lib/local.js b/libjsqrc/ethereumjs/lib/local.js
deleted file mode 100644
index 30cd14df2..000000000
--- a/libjsqrc/ethereumjs/lib/local.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var addressName = {"0x12378912345789": "Gav", "0x57835893478594739854": "Jeff"};
-var nameAddress = {};
-
-for (var prop in addressName) {
-  if (addressName.hasOwnProperty(prop)) {
-    nameAddress[addressName[prop]]  = prop;
-  }
-}
-
-var local = {
-  addressBook:{
-    byName: addressName,
-    byAddress: nameAddress
-  }
-};
-
-if (typeof(module) !== "undefined")
-    module.exports = local;
diff --git a/libjsqrc/ethereumjs/lib/requestmanager.js b/libjsqrc/ethereumjs/lib/requestmanager.js
deleted file mode 100644
index b19e5a2c7..000000000
--- a/libjsqrc/ethereumjs/lib/requestmanager.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-    This file is part of ethereum.js.
-
-    ethereum.js is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ethereum.js 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 Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file requestmanager.js
- * @authors:
- *   Jeffrey Wilcke <jeff@ethdev.com>
- *   Marek Kotewicz <marek@ethdev.com>
- *   Marian Oancea <marian@ethdev.com>
- *   Gav Wood <g@ethdev.com>
- * @date 2014
- */
-
-var jsonrpc = require('./jsonrpc');
-var c = require('./const');
-
-/**
- * It's responsible for passing messages to providers
- * It's also responsible for polling the ethereum node for incoming messages
- * Default poll timeout is 1 second
- */
-var requestManager = function() {
-    var polls = [];
-    var timeout = null;
-    var provider;
-
-    var send = function (data) {
-        var payload = jsonrpc.toPayload(data.method, data.params);
-        
-        if (!provider) {
-            console.error('provider is not set');
-            return null;
-        }
-
-        var result = provider.send(payload);
-
-        if (!jsonrpc.isValidResponse(result)) {
-            console.log(result);
-            return null;
-        }
-        
-        return result.result;
-    };
-
-    var setProvider = function (p) {
-        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--;) {
-            var poll = polls[i];
-            if (poll.id === pollId) {
-                polls.splice(i, 1);
-            }
-        }
-    };
-
-    var reset = function () {
-        polls.forEach(function (poll) {
-            poll.uninstall(poll.id); 
-        });
-        polls = [];
-
-        if (timeout) {
-            clearTimeout(timeout);
-            timeout = null;
-        }
-        poll();
-    };
-
-    var poll = function () {
-        polls.forEach(function (data) {
-            var result = send(data.data);
-            if (!(result instanceof Array) || result.length === 0) {
-                return;
-            }
-            data.callback(result);
-        });
-        timeout = setTimeout(poll, c.ETH_POLLING_TIMEOUT);
-    };
-    
-    poll();
-
-    return {
-        send: send,
-        setProvider: setProvider,
-        startPolling: startPolling,
-        stopPolling: stopPolling,
-        reset: reset
-    };
-};
-
-module.exports = requestManager;
-
diff --git a/libjsqrc/ethereumjs/lib/abi.js b/libjsqrc/ethereumjs/lib/solidity/abi.js
similarity index 68%
rename from libjsqrc/ethereumjs/lib/abi.js
rename to libjsqrc/ethereumjs/lib/solidity/abi.js
index ff06e8949..a1a9e18d4 100644
--- a/libjsqrc/ethereumjs/lib/abi.js
+++ b/libjsqrc/ethereumjs/lib/solidity/abi.js
@@ -21,34 +21,57 @@
  * @date 2014
  */
 
-var utils = require('./utils');
+var utils = require('../utils/utils');
+var c = require('../utils/config');
 var types = require('./types');
-var c = require('./const');
 var f = require('./formatters');
 
-var displayTypeError = function (type) {
-    console.error('parser does not support type: ' + type);
+/**
+ * throw incorrect type error
+ *
+ * @method throwTypeError
+ * @param {String} type
+ * @throws incorrect type error
+ */
+var throwTypeError = function (type) {
+    throw new Error('parser does not support type: ' + type);
 };
 
-/// This method should be called if we want to check if givent type is an array type
-/// @returns true if it is, otherwise false
-var arrayType = function (type) {
+/** This method should be called if we want to check if givent type is an array type
+ *
+ * @method isArrayType
+ * @param {String} type name
+ * @returns {Boolean} true if it is, otherwise false
+ */
+var isArrayType = function (type) {
     return type.slice(-2) === '[]';
 };
 
+/**
+ * This method should be called to return dynamic type length in hex
+ *
+ * @method dynamicTypeBytes
+ * @param {String} type
+ * @param {String|Array} dynamic type
+ * @return {String} length of dynamic type in hex or empty string if type is not dynamic
+ */
 var dynamicTypeBytes = function (type, value) {
     // TODO: decide what to do with array of strings
-    if (arrayType(type) || type === 'string')    // only string itself that is dynamic; stringX is static length.
+    if (isArrayType(type) || type === 'bytes')
         return f.formatInputInt(value.length);
     return "";
 };
 
 var inputTypes = types.inputTypes();
 
-/// Formats input params to bytes
-/// @param abi contract method inputs
-/// @param array of params that will be formatted to bytes
-/// @returns bytes representation of input params
+/**
+ * Formats input params to bytes
+ *
+ * @method formatInput
+ * @param {Array} abi inputs of method
+ * @param {Array} params that will be formatted to bytes
+ * @returns bytes representation of input params
+ */
 var formatInput = function (inputs, params) {
     var bytes = "";
     var toAppendConstant = "";
@@ -66,16 +89,16 @@ var formatInput = function (inputs, params) {
             typeMatch = inputTypes[j].type(inputs[i].type, params[i]);
         }
         if (!typeMatch) {
-            displayTypeError(inputs[i].type);
+            throwTypeError(inputs[i].type);
         }
 
         var formatter = inputTypes[j - 1].format;
 
-        if (arrayType(inputs[i].type))
+        if (isArrayType(inputs[i].type))
             toAppendArrayContent += params[i].reduce(function (acc, curr) {
                 return acc + formatter(curr);
             }, "");
-        else if (inputs[i].type === 'string')
+        else if (inputs[i].type === 'bytes')
             toAppendArrayContent += formatter(params[i]);
         else
             toAppendConstant += formatter(params[i]);
@@ -86,18 +109,29 @@ var formatInput = function (inputs, params) {
     return bytes;
 };
 
+/**
+ * This method should be called to predict the length of dynamic type
+ *
+ * @method dynamicBytesLength
+ * @param {String} type
+ * @returns {Number} length of dynamic type, 0 or multiplication of ETH_PADDING (32)
+ */
 var dynamicBytesLength = function (type) {
-    if (arrayType(type) || type === 'string')   // only string itself that is dynamic; stringX is static length.
+    if (isArrayType(type) || type === 'bytes')
         return c.ETH_PADDING * 2;
     return 0;
 };
 
 var outputTypes = types.outputTypes();
 
-/// Formats output bytes back to param list
-/// @param contract abi method outputs
-/// @param bytes representtion of output
-/// @returns array of output params
+/** 
+ * Formats output bytes back to param list
+ *
+ * @method formatOutput
+ * @param {Array} abi outputs of method
+ * @param {String} bytes represention of output
+ * @returns {Array} output params
+ */
 var formatOutput = function (outs, output) {
 
     output = output.slice(2);
@@ -119,11 +153,11 @@ var formatOutput = function (outs, output) {
         }
 
         if (!typeMatch) {
-            displayTypeError(outs[i].type);
+            throwTypeError(outs[i].type);
         }
 
         var formatter = outputTypes[j - 1].format;
-        if (arrayType(outs[i].type)) {
+        if (isArrayType(outs[i].type)) {
             var size = f.formatOutputUInt(dynamicPart.slice(0, padding));
             dynamicPart = dynamicPart.slice(padding);
             var array = [];
@@ -133,7 +167,7 @@ var formatOutput = function (outs, output) {
             }
             result.push(array);
         }
-        else if (types.prefixedType('string')(outs[i].type)) {
+        else if (types.prefixedType('bytes')(outs[i].type)) {
             dynamicPart = dynamicPart.slice(padding);
             result.push(formatter(output.slice(0, padding)));
             output = output.slice(padding);
@@ -146,9 +180,14 @@ var formatOutput = function (outs, output) {
     return result;
 };
 
-/// @param json abi for contract
-/// @returns input parser object for given json abi
-/// TODO: refactor creating the parser, do not double logic from contract
+/**
+ * Should be called to create input parser for contract with given abi
+ *
+ * @method inputParser
+ * @param {Array} contract abi
+ * @returns {Object} input parser object for given json abi
+ * TODO: refactor creating the parser, do not double logic from contract
+ */
 var inputParser = function (json) {
     var parser = {};
     json.forEach(function (method) {
@@ -170,8 +209,13 @@ var inputParser = function (json) {
     return parser;
 };
 
-/// @param json abi for contract
-/// @returns output parser for given json abi
+/**
+ * Should be called to create output parser for contract with given abi
+ *
+ * @method outputParser
+ * @param {Array} contract abi
+ * @returns {Object} output parser for given json abi
+ */
 var outputParser = function (json) {
     var parser = {};
     json.forEach(function (method) {
diff --git a/libjsqrc/ethereumjs/lib/formatters.js b/libjsqrc/ethereumjs/lib/solidity/formatters.js
similarity index 53%
rename from libjsqrc/ethereumjs/lib/formatters.js
rename to libjsqrc/ethereumjs/lib/solidity/formatters.js
index 223a444a9..11b3160a9 100644
--- a/libjsqrc/ethereumjs/lib/formatters.js
+++ b/libjsqrc/ethereumjs/lib/solidity/formatters.js
@@ -24,74 +24,93 @@ if (process.env.NODE_ENV !== 'build') {
     var BigNumber = require('bignumber.js'); // jshint ignore:line
 }
 
-var utils = require('./utils');
-var c = require('./const');
-
-/// @param string string to be padded
-/// @param number of characters that result string should have
-/// @param sign, by default 0
-/// @returns right aligned string
+var utils = require('../utils/utils');
+var c = require('../utils/config');
+
+/**
+ * Should be called to pad string to expected length
+ *
+ * @method padLeft
+ * @param {String} string to be padded
+ * @param {Number} characters that result string should have
+ * @param {String} sign, by default 0
+ * @returns {String} right aligned string
+ */
 var padLeft = function (string, chars, sign) {
     return new Array(chars - string.length + 1).join(sign ? sign : "0") + string;
 };
 
-/// Formats input value to byte representation of int
-/// If value is negative, return it's two's complement
-/// If the value is floating point, round it down
-/// @returns right-aligned byte representation of int
+/**
+ * Formats input value to byte representation of int
+ * If value is negative, return it's two's complement
+ * If the value is floating point, round it down
+ *
+ * @method formatInputInt
+ * @param {String|Number|BigNumber} value that needs to be formatted
+ * @returns {String} 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')
-            value = new BigNumber(value);
-        BigNumber.config(c.ETH_BIGNUMBER_ROUNDING_MODE);
-        value = value.round();
-
-        if (value.lessThan(0)) 
-            value = new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).plus(value).plus(1);
-        value = value.toString(16);
-    }
-    else if (value.indexOf('0x') === 0)
-        value = value.substr(2);
-    else if (typeof value === 'string')
-        value = formatInputInt(new BigNumber(value));
-    else
-        value = (+value).toString(16);
-    return padLeft(value, padding);
+    BigNumber.config(c.ETH_BIGNUMBER_ROUNDING_MODE);
+    return padLeft(utils.toTwosComplement(value).round().toString(16), padding);
 };
 
-/// Formats input value to byte representation of string
-/// @returns left-algined byte representation of string
+/**
+ * Formats input value to byte representation of string
+ *
+ * @method formatInputString
+ * @param {String}
+ * @returns {String} left-algined byte representation of string
+ */
 var formatInputString = function (value) {
     return utils.fromAscii(value, c.ETH_PADDING).substr(2);
 };
 
-/// Formats input value to byte representation of bool
-/// @returns right-aligned byte representation bool
+/**
+ * Formats input value to byte representation of bool
+ *
+ * @method formatInputBool
+ * @param {Boolean}
+ * @returns {String} right-aligned byte representation bool
+ */
 var formatInputBool = function (value) {
     return '000000000000000000000000000000000000000000000000000000000000000' + (value ?  '1' : '0');
 };
 
-/// Formats input value to byte representation of real
-/// Values are multiplied by 2^m and encoded as integers
-/// @returns byte representation of real
+/**
+ * Formats input value to byte representation of real
+ * Values are multiplied by 2^m and encoded as integers
+ *
+ * @method formatInputReal
+ * @param {String|Number|BigNumber}
+ * @returns {String} byte representation of real
+ */
 var formatInputReal = function (value) {
     return formatInputInt(new BigNumber(value).times(new BigNumber(2).pow(128))); 
 };
 
-
-/// Check if input value is negative
-/// @param value is hex format
-/// @returns true if it is negative, otherwise false
+/**
+ * Check if input value is negative
+ *
+ * @method signedIsNegative
+ * @param {String} value is hex format
+ * @returns {Boolean} true if it is negative, otherwise false
+ */
 var signedIsNegative = function (value) {
     return (new BigNumber(value.substr(0, 1), 16).toString(2).substr(0, 1)) === '1';
 };
 
-/// Formats input right-aligned input bytes to int
-/// @returns right-aligned input bytes formatted to int
+/**
+ * Formats right-aligned output bytes to int
+ *
+ * @method formatOutputInt
+ * @param {String} bytes
+ * @returns {BigNumber} right-aligned output bytes formatted to big number
+ */
 var formatOutputInt = function (value) {
+
     value = value || "0";
+
     // check if it's negative number
     // it it is, return two's complement
     if (signedIsNegative(value)) {
@@ -100,44 +119,84 @@ var formatOutputInt = function (value) {
     return new BigNumber(value, 16);
 };
 
-/// Formats big right-aligned input bytes to uint
-/// @returns right-aligned input bytes formatted to uint
+/**
+ * Formats right-aligned output bytes to uint
+ *
+ * @method formatOutputUInt
+ * @param {String} bytes
+ * @returns {BigNumeber} right-aligned output bytes formatted to uint
+ */
 var formatOutputUInt = function (value) {
     value = value || "0";
     return new BigNumber(value, 16);
 };
 
-/// @returns input bytes formatted to real
+/**
+ * Formats right-aligned output bytes to real
+ *
+ * @method formatOutputReal
+ * @param {String}
+ * @returns {BigNumber} input bytes formatted to real
+ */
 var formatOutputReal = function (value) {
     return formatOutputInt(value).dividedBy(new BigNumber(2).pow(128)); 
 };
 
-/// @returns input bytes formatted to ureal
+/**
+ * Formats right-aligned output bytes to ureal
+ *
+ * @method formatOutputUReal
+ * @param {String}
+ * @returns {BigNumber} input bytes formatted to ureal
+ */
 var formatOutputUReal = function (value) {
     return formatOutputUInt(value).dividedBy(new BigNumber(2).pow(128)); 
 };
 
-/// @returns right-aligned input bytes formatted to hex
+/**
+ * Should be used to format output hash
+ *
+ * @method formatOutputHash
+ * @param {String}
+ * @returns {String} right-aligned output bytes formatted to hex
+ */
 var formatOutputHash = function (value) {
     return "0x" + value;
 };
 
-/// @returns right-aligned input bytes formatted to bool
+/**
+ * Should be used to format output bool
+ *
+ * @method formatOutputBool
+ * @param {String}
+ * @returns {Boolean} right-aligned input bytes formatted to bool
+ */
 var formatOutputBool = function (value) {
     return value === '0000000000000000000000000000000000000000000000000000000000000001' ? true : false;
 };
 
-/// @returns left-aligned input bytes formatted to ascii string
+/**
+ * Should be used to format output string
+ *
+ * @method formatOutputString
+ * @param {Sttring} left-aligned hex representation of string
+ * @returns {String} ascii string
+ */
 var formatOutputString = function (value) {
     return utils.toAscii(value);
 };
 
-/// @returns right-aligned input bytes formatted to address
+/**
+ * Should be used to format output address
+ *
+ * @method formatOutputAddress
+ * @param {String} right-aligned input bytes
+ * @returns {String} address
+ */
 var formatOutputAddress = function (value) {
     return "0x" + value.slice(value.length - 40, value.length);
 };
 
-
 module.exports = {
     formatInputInt: formatInputInt,
     formatInputString: formatInputString,
diff --git a/libjsqrc/ethereumjs/lib/types.js b/libjsqrc/ethereumjs/lib/solidity/types.js
similarity index 90%
rename from libjsqrc/ethereumjs/lib/types.js
rename to libjsqrc/ethereumjs/lib/solidity/types.js
index a39f2f1fc..f1e4f3491 100644
--- a/libjsqrc/ethereumjs/lib/types.js
+++ b/libjsqrc/ethereumjs/lib/solidity/types.js
@@ -45,8 +45,7 @@ var inputTypes = function () {
     return [
         { type: prefixedType('uint'), format: f.formatInputInt },
         { type: prefixedType('int'), format: f.formatInputInt },
-        { type: prefixedType('hash'), format: f.formatInputInt },
-        { type: prefixedType('string'), format: f.formatInputString }, 
+        { type: prefixedType('bytes'), format: f.formatInputString }, 
         { type: prefixedType('real'), format: f.formatInputReal },
         { type: prefixedType('ureal'), format: f.formatInputReal },
         { type: namedType('address'), format: f.formatInputInt },
@@ -61,8 +60,7 @@ var outputTypes = function () {
     return [
         { type: prefixedType('uint'), format: f.formatOutputUInt },
         { type: prefixedType('int'), format: f.formatOutputInt },
-        { type: prefixedType('hash'), format: f.formatOutputHash },
-        { type: prefixedType('string'), format: f.formatOutputString },
+        { type: prefixedType('bytes'), format: f.formatOutputString },
         { type: prefixedType('real'), format: f.formatOutputReal },
         { type: prefixedType('ureal'), format: f.formatOutputUReal },
         { type: namedType('address'), format: f.formatOutputAddress },
diff --git a/libjsqrc/ethereumjs/lib/utils.js b/libjsqrc/ethereumjs/lib/utils.js
deleted file mode 100644
index f88e6ab90..000000000
--- a/libjsqrc/ethereumjs/lib/utils.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-    This file is part of ethereum.js.
-
-    ethereum.js is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ethereum.js 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 Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file utils.js
- * @authors:
- *   Marek Kotewicz <marek@ethdev.com>
- * @date 2015
- */
-
-var c = require('./const');
-
-/// Finds first index of array element matching pattern
-/// @param array
-/// @param callback pattern
-/// @returns index of element
-var findIndex = function (array, callback) {
-    var end = false;
-    var i = 0;
-    for (; i < array.length && !end; i++) {
-        end = callback(array[i]);
-    }
-    return end ? i - 1 : -1;
-};
-
-/// @returns ascii string representation of hex value prefixed with 0x
-var toAscii = function(hex) {
-// Find termination
-    var str = "";
-    var i = 0, l = hex.length;
-    if (hex.substring(0, 2) === '0x') {
-        i = 2;
-    }
-    for (; i < l; i+=2) {
-        var code = parseInt(hex.substr(i, 2), 16);
-        if (code === 0) {
-            break;
-        }
-
-        str += String.fromCharCode(code);
-    }
-
-    return str;
-};
-    
-var toHex = function(str) {
-    var hex = "";
-    for(var i = 0; i < str.length; i++) {
-        var n = str.charCodeAt(i).toString(16);
-        hex += n.length < 2 ? '0' + n : n;
-    }
-
-    return hex;
-};
-
-/// @returns hex representation (prefixed by 0x) of ascii string
-var fromAscii = function(str, pad) {
-    pad = pad === undefined ? 0 : pad;
-    var hex = toHex(str);
-    while (hex.length < pad*2)
-        hex += "00";
-    return "0x" + hex;
-};
-
-/// @returns display name for function/event eg. multiply(uint256) -> multiply
-var extractDisplayName = function (name) {
-    var length = name.indexOf('('); 
-    return length !== -1 ? name.substr(0, length) : name;
-};
-
-/// @returns overloaded part of function/event name
-var extractTypeName = function (name) {
-    /// TODO: make it invulnerable
-    var length = name.indexOf('(');
-    return length !== -1 ? name.substr(length + 1, name.length - 1 - (length + 1)).replace(' ', '') : "";
-};
-
-/// Filters all function from input abi
-/// @returns abi array with filtered objects of type 'function'
-var filterFunctions = function (json) {
-    return json.filter(function (current) {
-        return current.type === 'function'; 
-    }); 
-};
-
-/// Filters all events form input abi
-/// @returns abi array with filtered objects of type 'event'
-var filterEvents = function (json) {
-    return json.filter(function (current) {
-        return current.type === 'event';
-    });
-};
-
-/// used to transform value/string to eth string
-/// 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;
-    while (val > 3000 && unit < units.length - 1)
-    {
-        val /= 1000;
-        unit++;
-    }
-    var s = val.toString().length < val.toFixed(2).length ? val.toString() : val.toFixed(2);
-    var replaceFunction = function($0, $1, $2) {
-        return $1 + ',' + $2;
-    };
-
-    while (true) {
-        var o = s;
-        s = s.replace(/(\d)(\d\d\d[\.\,])/, replaceFunction);
-        if (o === s)
-            break;
-    }
-    return s + ' ' + units[unit];
-};
-
-module.exports = {
-    findIndex: findIndex,
-    toAscii: toAscii,
-    fromAscii: fromAscii,
-    extractDisplayName: extractDisplayName,
-    extractTypeName: extractTypeName,
-    filterFunctions: filterFunctions,
-    filterEvents: filterEvents,
-    toEth: toEth
-};
-
diff --git a/libjsqrc/ethereumjs/lib/const.js b/libjsqrc/ethereumjs/lib/utils/config.js
similarity index 87%
rename from libjsqrc/ethereumjs/lib/const.js
rename to libjsqrc/ethereumjs/lib/utils/config.js
index f7ccc9e28..f5b10684b 100644
--- a/libjsqrc/ethereumjs/lib/const.js
+++ b/libjsqrc/ethereumjs/lib/utils/config.js
@@ -14,12 +14,25 @@
     You should have received a copy of the GNU Lesser General Public License
     along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-/** @file const.js
+/** @file config.js
  * @authors:
  *   Marek Kotewicz <marek@ethdev.com>
  * @date 2015
  */
 
+/**
+ * Utils
+ * 
+ * @module utils
+ */
+
+/**
+ * Utility functions
+ * 
+ * @class [utils] config
+ * @constructor
+ */
+
 /// required to define ETH_BIGNUMBER_ROUNDING_MODE
 if (process.env.NODE_ENV !== 'build') {
     var BigNumber = require('bignumber.js'); // jshint ignore:line
@@ -52,6 +65,7 @@ module.exports = {
     ETH_SIGNATURE_LENGTH: 4,
     ETH_UNITS: ETH_UNITS,
     ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN },
-    ETH_POLLING_TIMEOUT: 1000
+    ETH_POLLING_TIMEOUT: 1000,
+    ETH_DEFAULTBLOCK: 'latest'
 };
 
diff --git a/libjsqrc/ethereumjs/lib/utils/utils.js b/libjsqrc/ethereumjs/lib/utils/utils.js
new file mode 100644
index 000000000..680ea9b65
--- /dev/null
+++ b/libjsqrc/ethereumjs/lib/utils/utils.js
@@ -0,0 +1,448 @@
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js 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 Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file utils.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ * @date 2015
+ */
+
+/**
+ * Utils
+ * 
+ * @module utils
+ */
+
+/**
+ * Utility functions
+ * 
+ * @class [utils] utils
+ * @constructor
+ */
+
+if (process.env.NODE_ENV !== 'build') {
+    var BigNumber = require('bignumber.js'); // jshint ignore:line
+}
+
+var unitMap = {
+    'wei':      '1',
+    'kwei':     '1000',
+    'ada':      '1000',
+    'mwei':     '1000000',
+    'babbage':  '1000000',
+    'gwei':     '1000000000',
+    'shannon':  '1000000000',
+    'szabo':    '1000000000000',
+    'finney':   '1000000000000000',
+    'ether':    '1000000000000000000',
+    'kether':   '1000000000000000000000',
+    'grand':    '1000000000000000000000',
+    'einstein': '1000000000000000000000',
+    'mether':   '1000000000000000000000000',
+    'gether':   '1000000000000000000000000000',
+    'tether':   '1000000000000000000000000000000'
+};
+
+
+/** Finds first index of array element matching pattern
+ *
+ * @method findIndex
+ * @param {Array}
+ * @param {Function} pattern
+ * @returns {Number} index of element
+ */
+var findIndex = function (array, callback) {
+    var end = false;
+    var i = 0;
+    for (; i < array.length && !end; i++) {
+        end = callback(array[i]);
+    }
+    return end ? i - 1 : -1;
+};
+
+/** 
+ * Should be called to get sting from it's hex representation
+ *
+ * @method toAscii
+ * @param {String} string in hex
+ * @returns {String} ascii string representation of hex value
+ */
+var toAscii = function(hex) {
+// Find termination
+    var str = "";
+    var i = 0, l = hex.length;
+    if (hex.substring(0, 2) === '0x') {
+        i = 2;
+    }
+    for (; i < l; i+=2) {
+        var code = parseInt(hex.substr(i, 2), 16);
+        if (code === 0) {
+            break;
+        }
+
+        str += String.fromCharCode(code);
+    }
+
+    return str;
+};
+    
+/**
+ * Shold be called to get hex representation (prefixed by 0x) of ascii string 
+ *
+ * @method fromAscii
+ * @param {String} string
+ * @returns {String} hex representation of input string
+ */
+var toHexNative = function(str) {
+    var hex = "";
+    for(var i = 0; i < str.length; i++) {
+        var n = str.charCodeAt(i).toString(16);
+        hex += n.length < 2 ? '0' + n : n;
+    }
+
+    return hex;
+};
+
+/**
+ * Shold be called to get hex representation (prefixed by 0x) of ascii string 
+ *
+ * @method fromAscii
+ * @param {String} string
+ * @param {Number} optional padding
+ * @returns {String} hex representation of input string
+ */
+var fromAscii = function(str, pad) {
+    pad = pad === undefined ? 0 : pad;
+    var hex = toHexNative(str);
+    while (hex.length < pad*2)
+        hex += "00";
+    return "0x" + hex;
+};
+
+/**
+ * Should be called to get display name of contract function
+ * 
+ * @method extractDisplayName
+ * @param {String} name of function/event
+ * @returns {String} display name for function/event eg. multiply(uint256) -> multiply
+ */
+var extractDisplayName = function (name) {
+    var length = name.indexOf('('); 
+    return length !== -1 ? name.substr(0, length) : name;
+};
+
+/// @returns overloaded part of function/event name
+var extractTypeName = function (name) {
+    /// TODO: make it invulnerable
+    var length = name.indexOf('(');
+    return length !== -1 ? name.substr(length + 1, name.length - 1 - (length + 1)).replace(' ', '') : "";
+};
+
+/**
+ * Filters all functions from input abi
+ *
+ * @method filterFunctions
+ * @param {Array} abi
+ * @returns {Array} abi array with filtered objects of type 'function'
+ */
+var filterFunctions = function (json) {
+    return json.filter(function (current) {
+        return current.type === 'function'; 
+    }); 
+};
+
+/**
+ * Filters all events from input abi
+ *
+ * @method filterEvents
+ * @param {Array} abi
+ * @returns {Array} abi array with filtered objects of type 'event'
+ */
+var filterEvents = function (json) {
+    return json.filter(function (current) {
+        return current.type === 'event';
+    });
+};
+
+/**
+ * Converts value to it's decimal representation in string
+ *
+ * @method toDecimal
+ * @param {String|Number|BigNumber}
+ * @return {String}
+ */
+var toDecimal = function (value) {
+    return toBigNumber(value).toNumber();
+};
+
+/**
+ * Converts value to it's hex representation
+ *
+ * @method fromDecimal
+ * @param {String|Number|BigNumber}
+ * @return {String}
+ */
+var fromDecimal = function (value) {
+    var number = toBigNumber(value);
+    var result = number.toString(16);
+
+    return number.lessThan(0) ? '-0x' + result.substr(1) : '0x' + result;
+};
+
+/**
+ * Auto converts any given value into it's hex representation.
+ *
+ * And even stringifys objects before.
+ *
+ * @method toHex
+ * @param {String|Number|BigNumber|Object}
+ * @return {String}
+ */
+var toHex = function (val) {
+    /*jshint maxcomplexity:7 */
+
+    if(isBoolean(val))
+        return val;
+
+    if(isBigNumber(val))
+        return fromDecimal(val);
+
+    if(isObject(val))
+        return fromAscii(JSON.stringify(val));
+
+    // if its a negative number, pass it through fromDecimal
+    if (isString(val)) {
+        if (val.indexOf('-0x') === 0)
+           return fromDecimal(val);
+        else if (!isFinite(val))
+            return fromAscii(val);
+    }
+
+    return fromDecimal(val);
+};
+
+/**
+ * Returns value of unit in Wei
+ *
+ * @method getValueOfUnit
+ * @param {String} unit the unit to convert to, default ether
+ * @returns {BigNumber} value of the unit (in Wei)
+ * @throws error if the unit is not correct:w
+ */
+var getValueOfUnit = function (unit) {
+    unit = unit ? unit.toLowerCase() : 'ether';
+    var unitValue = unitMap[unit];
+    if (unitValue === undefined) {
+        throw new Error('This unit doesn\'t exists, please use the one of the following units' + JSON.stringify(unitMap, null, 2));
+    }
+    return new BigNumber(unitValue, 10);
+};
+
+/**
+ * Takes a number of wei and converts it to any other ether unit.
+ *
+ * Possible units are:
+ * - kwei/ada
+ * - mwei/babbage
+ * - gwei/shannon
+ * - szabo
+ * - finney
+ * - ether
+ * - kether/grand/einstein
+ * - mether
+ * - gether
+ * - tether
+ *
+ * @method fromWei
+ * @param {Number|String} number can be a number, number string or a HEX of a decimal
+ * @param {String} unit the unit to convert to, default ether
+ * @return {String|Object} When given a BigNumber object it returns one as well, otherwise a number
+*/
+var fromWei = function(number, unit) {
+    var returnValue = toBigNumber(number).dividedBy(getValueOfUnit(unit));
+
+    return isBigNumber(number) ? returnValue : returnValue.toString(10); 
+};
+
+/**
+ * Takes a number of a unit and converts it to wei.
+ *
+ * Possible units are:
+ * - kwei/ada
+ * - mwei/babbage
+ * - gwei/shannon
+ * - szabo
+ * - finney
+ * - ether
+ * - kether/grand/einstein
+ * - mether
+ * - gether
+ * - tether
+ *
+ * @method toWei
+ * @param {Number|String|BigNumber} number can be a number, number string or a HEX of a decimal
+ * @param {String} unit the unit to convert from, default ether
+ * @return {String|Object} When given a BigNumber object it returns one as well, otherwise a number
+*/
+var toWei = function(number, unit) {
+    var returnValue = toBigNumber(number).times(getValueOfUnit(unit));
+
+    return isBigNumber(number) ? returnValue : returnValue.toString(10); 
+};
+
+/**
+ * Takes an input and transforms it into an bignumber
+ *
+ * @method toBigNumber
+ * @param {Number|String|BigNumber} a number, string, HEX string or BigNumber
+ * @return {BigNumber} BigNumber
+*/
+var toBigNumber = function(number) {
+    /*jshint maxcomplexity:5 */
+    number = number || 0;
+    if (isBigNumber(number))
+        return number;
+
+    if (isString(number) && (number.indexOf('0x') === 0 || number.indexOf('-0x') === 0)) {
+        return new BigNumber(number.replace('0x',''), 16);
+    }
+   
+    return new BigNumber(number.toString(10), 10);
+};
+
+/**
+ * Takes and input transforms it into bignumber and if it is negative value, into two's complement
+ *
+ * @method toTwosComplement
+ * @param {Number|String|BigNumber}
+ * @return {BigNumber}
+ */
+var toTwosComplement = function (number) {
+    var bigNumber = toBigNumber(number);
+    if (bigNumber.lessThan(0)) {
+        return new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).plus(bigNumber).plus(1);
+    }
+    return bigNumber;
+};
+
+/**
+ * Checks if the given string has proper length
+ *
+ * @method isAddress
+ * @param {String} address the given HEX adress
+ * @return {Boolean}
+*/
+var isAddress = function(address) {
+    if (!isString(address)) {
+        return false;
+    }
+
+    return ((address.indexOf('0x') === 0 && address.length === 42) ||
+            (address.indexOf('0x') === -1 && address.length === 40));
+};
+
+/**
+ * Returns true if object is BigNumber, otherwise false
+ *
+ * @method isBigNumber
+ * @param {Object}
+ * @return {Boolean} 
+ */
+var isBigNumber = function (object) {
+    return object instanceof BigNumber ||
+        (object && object.constructor && object.constructor.name === 'BigNumber');
+};
+
+/**
+ * Returns true if object is string, otherwise false
+ * 
+ * @method isString
+ * @param {Object}
+ * @return {Boolean}
+ */
+var isString = function (object) {
+    return typeof object === 'string' ||
+        (object && object.constructor && object.constructor.name === 'String');
+};
+
+/**
+ * Returns true if object is function, otherwise false
+ *
+ * @method isFunction
+ * @param {Object}
+ * @return {Boolean}
+ */
+var isFunction = function (object) {
+    return typeof object === 'function';
+};
+
+/**
+ * Returns true if object is Objet, otherwise false
+ *
+ * @method isObject
+ * @param {Object}
+ * @return {Boolean}
+ */
+var isObject = function (object) {
+    return typeof object === 'object';
+};
+
+/**
+ * Returns true if object is boolean, otherwise false
+ *
+ * @method isBoolean
+ * @param {Object}
+ * @return {Boolean}
+ */
+var isBoolean = function (object) {
+    return typeof object === 'boolean';
+};
+
+/**
+ * Returns true if object is array, otherwise false
+ *
+ * @method isArray
+ * @param {Object}
+ * @return {Boolean}
+ */
+var isArray = function (object) {
+    return object instanceof Array; 
+};
+
+module.exports = {
+    findIndex: findIndex,
+    toHex: toHex,
+    toDecimal: toDecimal,
+    fromDecimal: fromDecimal,
+    toAscii: toAscii,
+    fromAscii: fromAscii,
+    extractDisplayName: extractDisplayName,
+    extractTypeName: extractTypeName,
+    filterFunctions: filterFunctions,
+    filterEvents: filterEvents,
+    toWei: toWei,
+    fromWei: fromWei,
+    toBigNumber: toBigNumber,
+    toTwosComplement: toTwosComplement,
+    isBigNumber: isBigNumber,
+    isAddress: isAddress,
+    isFunction: isFunction,
+    isString: isString,
+    isObject: isObject,
+    isBoolean: isBoolean,
+    isArray: isArray
+};
+
diff --git a/libjsqrc/ethereumjs/lib/web3.js b/libjsqrc/ethereumjs/lib/web3.js
index 40b96625e..041cfa4ee 100644
--- a/libjsqrc/ethereumjs/lib/web3.js
+++ b/libjsqrc/ethereumjs/lib/web3.js
@@ -19,41 +19,84 @@
  *   Jeffrey Wilcke <jeff@ethdev.com>
  *   Marek Kotewicz <marek@ethdev.com>
  *   Marian Oancea <marian@ethdev.com>
+ *   Fabian Vogelsteller <fabian@ethdev.com>
  *   Gav Wood <g@ethdev.com>
  * @date 2014
  */
 
-if (process.env.NODE_ENV !== 'build') {
-    var BigNumber = require('bignumber.js');
-}
-
-var eth = require('./eth');
-var db = require('./db');
-var shh = require('./shh');
-var watches = require('./watches');
-var filter = require('./filter');
-var utils = require('./utils');
-var requestManager = require('./requestmanager');
+var version = require('../version.json');
+var net = require('./web3/net');
+var eth = require('./web3/eth');
+var db = require('./web3/db');
+var shh = require('./web3/shh');
+var watches = require('./web3/watches');
+var filter = require('./web3/filter');
+var utils = require('./utils/utils');
+var formatters = require('./solidity/formatters');
+var requestManager = require('./web3/requestmanager');
+var c = require('./utils/config');
 
 /// @returns an array of objects describing web3 api methods
-var web3Methods = function () {
-    return [
-    { name: 'sha3', call: 'web3_sha3' }
-    ];
-};
+var web3Methods = [
+    { name: 'sha3', call: 'web3_sha3', inputFormatter: utils.toHex },
+];
+var web3Properties = [
+    { name: 'version.client', getter: 'web3_clientVersion' },
+    { name: 'version.network', getter: 'net_version' }
+];
+
 
 /// creates methods in a given object based on method description on input
 /// setups api calls for these methods
 var setupMethods = function (obj, methods) {
     methods.forEach(function (method) {
-        obj[method.name] = function () {
-            var args = Array.prototype.slice.call(arguments);
-            var call = typeof method.call === 'function' ? method.call(args) : method.call;
-            return web3.manager.send({
-                method: call,
-                params: args
-            });
-        };
+        // allow for object methods 'myObject.method'
+        var objectMethods = method.name.split('.'),
+            callFunction = function () {
+                /*jshint maxcomplexity:8 */
+                
+                var callback = null,
+                    args = Array.prototype.slice.call(arguments),
+                    call = typeof method.call === 'function' ? method.call(args) : method.call;
+
+                // get the callback if one is available
+                if(typeof args[args.length-1] === 'function'){
+                    callback = args[args.length-1];
+                    Array.prototype.pop.call(args);
+                }
+
+                // add the defaultBlock if not given
+                if(method.addDefaultblock) {
+                    if(args.length !== method.addDefaultblock)
+                        Array.prototype.push.call(args, (isFinite(c.ETH_DEFAULTBLOCK) ? utils.fromDecimal(c.ETH_DEFAULTBLOCK) : c.ETH_DEFAULTBLOCK));
+                    else
+                        args[args.length-1] = isFinite(args[args.length-1]) ? utils.fromDecimal(args[args.length-1]) : args[args.length-1];
+                }
+
+                // show deprecated warning
+                if(method.newMethod)
+                    console.warn('This method is deprecated please use web3.'+ method.newMethod +'() instead.');
+
+                return web3.manager.send({
+                    method: call,
+                    params: args,
+                    outputFormatter: method.outputFormatter,
+                    inputFormatter: method.inputFormatter,
+                    addDefaultblock: method.addDefaultblock
+                }, callback);
+            };
+
+        if(objectMethods.length > 1) {
+            if(!obj[objectMethods[0]])
+                obj[objectMethods[0]] = {};
+
+            obj[objectMethods[0]][objectMethods[1]] = callFunction;
+        
+        } else {
+
+            obj[objectMethods[0]] = callFunction;
+        }
+
     });
 };
 
@@ -61,22 +104,47 @@ var setupMethods = function (obj, methods) {
 /// setups api calls for these properties
 var setupProperties = function (obj, properties) {
     properties.forEach(function (property) {
-        var proto = {};
+        var objectProperties = property.name.split('.'),
+            proto = {};
+
         proto.get = function () {
+
+            // show deprecated warning
+            if(property.newProperty)
+                console.warn('This property is deprecated please use web3.'+ property.newProperty +' instead.');
+
+
             return web3.manager.send({
-                method: property.getter
+                method: property.getter,
+                outputFormatter: property.outputFormatter
             });
         };
 
         if (property.setter) {
             proto.set = function (val) {
+
+                // show deprecated warning
+                if(property.newProperty)
+                    console.warn('This property is deprecated please use web3.'+ property.newProperty +' instead.');
+
                 return web3.manager.send({
                     method: property.setter,
-                    params: [val]
+                    params: [val],
+                    inputFormatter: property.inputFormatter
                 });
             };
         }
-        Object.defineProperty(obj, property.name, proto);
+
+        proto.enumerable = !property.newProperty;
+
+        if(objectProperties.length > 1) {
+            if(!obj[objectProperties[0]])
+                obj[objectProperties[0]] = {};
+
+            Object.defineProperty(obj[objectProperties[0]], objectProperties[1], proto);        
+        } else
+            Object.defineProperty(obj, property.name, proto);
+
     });
 };
 
@@ -94,20 +162,38 @@ var stopPolling = function (id) {
 };
 
 var ethWatch = {
-    startPolling: startPolling.bind(null, 'eth_changed'), 
+    startPolling: startPolling.bind(null, 'eth_getFilterChanges'), 
     stopPolling: stopPolling
 };
 
 var shhWatch = {
-    startPolling: startPolling.bind(null, 'shh_changed'), 
+    startPolling: startPolling.bind(null, 'shh_getFilterChanges'), 
     stopPolling: stopPolling
 };
 
 /// setups web3 object, and it's in-browser executed methods
 var web3 = {
+
+    version: {
+        api: version.version
+    },
+
     manager: requestManager(),
     providers: {},
 
+    setProvider: function (provider) {
+        web3.manager.setProvider(provider);
+    },
+    
+    /// Should be called to reset state of web3 object
+    /// Resets everything except manager
+    reset: function () {
+        web3.manager.reset(); 
+    },
+
+    /// @returns hex string of the input
+    toHex: utils.toHex,
+
     /// @returns ascii string representation of hex value prefixed with 0x
     toAscii: utils.toAscii,
 
@@ -115,23 +201,30 @@ var web3 = {
     fromAscii: utils.fromAscii,
 
     /// @returns decimal representaton of hex value prefixed by 0x
-    toDecimal: function (val) {
-        // remove 0x and place 0, if it's required
-        val = val.length > 2 ? val.substring(2) : "0";
-        return (new BigNumber(val, 16).toString(10));
-    },
+    toDecimal: utils.toDecimal,
 
     /// @returns hex representation (prefixed by 0x) of decimal value
-    fromDecimal: function (val) {
-        return "0x" + (new BigNumber(val).toString(16));
+    fromDecimal: utils.fromDecimal,
+
+    /// @returns a BigNumber object
+    toBigNumber: utils.toBigNumber,
+
+    toWei: utils.toWei,
+    fromWei: utils.fromWei,
+    isAddress: utils.isAddress,
+
+    // provide network information
+    net: {
+        // peerCount: 
     },
 
-    /// used to transform value/string to eth string
-    toEth: utils.toEth,
 
     /// eth object prototype
     eth: {
+        // DEPRECATED
         contractFromAbi: function (abi) {
+            console.warn('Initiating a contract like this is deprecated please use var MyContract = eth.contract(abi); new MyContract(address); instead.');
+
             return function(addr) {
                 // Default to address of Config. TODO: rremove prior to genesis.
                 addr = addr || '0xc6d9d2cd449a754c494264e1809c50e34d64562b';
@@ -141,24 +234,22 @@ var web3 = {
             };
         },
 
-        canary: function (abi) {
-            return function(addr) {
-                // Default to address of Config. TODO: rremove prior to genesis.
-                addr = addr || '0xc6d9d2cd449a754c494264e1809c50e34d64562b';
-                return addr;
-            };
-        },
-
         /// @param filter may be a string, object or event
-        /// @param indexed is optional, this is an object with optional event indexed params
+        /// @param eventParams is optional, this is an object with optional event eventParams 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);
+        filter: function (fil, eventParams, options) {
+
+            // if its event, treat it differently
+            if (fil._isEvent)
+                return fil(eventParams, options);
+
+            return filter(fil, ethWatch, formatters.outputLogFormatter);
+        },
+        // DEPRECATED
+        watch: function (fil, eventParams, options) {
+            console.warn('eth.watch() is deprecated please use eth.filter() instead.');
+            return this.filter(fil, eventParams, options);
         }
         /*jshint maxparams:3 */
     },
@@ -169,25 +260,37 @@ var web3 = {
     /// shh object prototype
     shh: {
         /// @param filter may be a string, object or event
+        filter: function (fil) {
+            return filter(fil, shhWatch, formatters.outputPostFormatter);
+        },
+        // DEPRECATED
         watch: function (fil) {
-            return filter(fil, shhWatch);
+            console.warn('shh.watch() is deprecated please use shh.filter() instead.');
+            return this.filter(fil);
         }
-    },
-    setProvider: function (provider) {
-        web3.manager.setProvider(provider);
-    },
-    
-    /// Should be called to reset state of web3 object
-    /// Resets everything except manager
-    reset: function () {
-        web3.manager.reset(); 
     }
 };
 
+
+// ADD defaultblock
+Object.defineProperty(web3.eth, 'defaultBlock', {
+    get: function () {
+        return c.ETH_DEFAULTBLOCK;
+    },
+    set: function (val) {
+        c.ETH_DEFAULTBLOCK = val;
+        return c.ETH_DEFAULTBLOCK;
+    }
+});
+
+
 /// setups all api methods
-setupMethods(web3, web3Methods());
-setupMethods(web3.eth, eth.methods());
-setupProperties(web3.eth, eth.properties());
+setupMethods(web3, web3Methods);
+setupProperties(web3, web3Properties);
+setupMethods(web3.net, net.methods);
+setupProperties(web3.net, net.properties);
+setupMethods(web3.eth, eth.methods);
+setupProperties(web3.eth, eth.properties);
 setupMethods(web3.db, db.methods());
 setupMethods(web3.shh, shh.methods());
 setupMethods(ethWatch, watches.eth());
diff --git a/libjsqrc/ethereumjs/lib/contract.js b/libjsqrc/ethereumjs/lib/web3/contract.js
similarity index 75%
rename from libjsqrc/ethereumjs/lib/contract.js
rename to libjsqrc/ethereumjs/lib/web3/contract.js
index 87a063921..d803faf2b 100644
--- a/libjsqrc/ethereumjs/lib/contract.js
+++ b/libjsqrc/ethereumjs/lib/web3/contract.js
@@ -20,9 +20,9 @@
  * @date 2014
  */
 
-var web3 = require('./web3'); 
-var abi = require('./abi');
-var utils = require('./utils');
+var web3 = require('../web3'); 
+var abi = require('../solidity/abi');
+var utils = require('../utils/utils');
 var eventImpl = require('./event');
 var signature = require('./signature');
 
@@ -38,16 +38,24 @@ var exportNatspecGlobals = function (vars) {
 var addFunctionRelatedPropertiesToContract = function (contract) {
     
     contract.call = function (options) {
-        contract._isTransact = false;
+        contract._isTransaction = false;
         contract._options = options;
         return contract;
     };
 
-    contract.transact = function (options) {
-        contract._isTransact = true;
+
+    contract.sendTransaction = function (options) {
+        contract._isTransaction = true;
         contract._options = options;
         return contract;
     };
+    // DEPRECATED
+    contract.transact = function (options) {
+
+        console.warn('myContract.transact() is deprecated please use myContract.sendTransaction() instead.');
+
+        return contract.sendTransaction(options);
+    };
 
     contract._options = {};
     ['gas', 'gasPrice', 'value', 'from'].forEach(function(p) {
@@ -79,14 +87,14 @@ var addFunctionsToContract = function (contract, desc, address) {
             options.to = address;
             options.data = sign + parsed;
             
-            var isTransact = contract._isTransact === true || (contract._isTransact !== false && !method.constant);
+            var isTransaction = contract._isTransaction === true || (contract._isTransaction !== false && !method.constant);
             var collapse = options.collapse !== false;
             
             // reset
             contract._options = {};
-            contract._isTransact = null;
+            contract._isTransaction = null;
 
-            if (isTransact) {
+            if (isTransaction) {
                 
                 exportNatspecGlobals({
                     abi: desc,
@@ -96,7 +104,7 @@ var addFunctionsToContract = function (contract, desc, address) {
                 });
 
                 // transactions do not have any output, cause we do not know, when they will be processed
-                web3.eth.transact(options);
+                web3.eth.sendTransaction(options);
                 return;
             }
             
@@ -128,7 +136,7 @@ var addEventRelatedPropertiesToContract = function (contract, desc, address) {
         return parser(data);
     };
     
-    Object.defineProperty(contract, 'topic', {
+    Object.defineProperty(contract, 'topics', {
         get: function() {
             return utils.filterEvents(desc).map(function (e) {
                 return signature.eventSignatureFromAscii(e.name);
@@ -151,7 +159,7 @@ var addEventsToContract = function (contract, desc, address) {
                 var parser = eventImpl.outputParser(e);
                 return parser(data);
             };
-            return web3.eth.watch(o, undefined, undefined, outputFormatter);
+            return web3.eth.filter(o, undefined, undefined, outputFormatter);
         };
         
         // this property should be used by eth.filter to check if object is an event
@@ -181,24 +189,40 @@ var addEventsToContract = function (contract, desc, address) {
  *      outputs: [{name: 'd', type: 'string' }]
  * }];  // contract abi
  *
- * var myContract = web3.eth.contract('0x0123123121', abi); // creation of contract object
+ * var MyContract = web3.eth.contract(abi); // creation of contract prototype
+ *
+ * var contractInstance = new MyContract('0x0123123121');
  *
- * myContract.myMethod('this is test string param for call'); // myMethod call (implicit, default)
- * myContract.call().myMethod('this is test string param for call'); // myMethod call (explicit)
- * myContract.transact().myMethod('this is test string param for transact'); // myMethod transact
+ * contractInstance.myMethod('this is test string param for call'); // myMethod call (implicit, default)
+ * contractInstance.call().myMethod('this is test string param for call'); // myMethod call (explicit)
+ * contractInstance.sendTransaction().myMethod('this is test string param for transact'); // myMethod sendTransaction
  *
- * @param address - address of the contract, which should be called
- * @param desc - abi json description of the contract, which is being created
+ * @param abi - abi json description of the contract, which is being created
  * @returns contract object
  */
+var contract = function (abi) {
 
-var contract = function (address, desc) {
+    // return prototype
+    if(abi instanceof Array && arguments.length === 1) {
+        return Contract.bind(null, abi);
+
+    // deprecated: auto initiate contract
+    } else {
+
+        console.warn('Initiating a contract like this is deprecated please use var MyContract = eth.contract(abi); new MyContract(address); instead.');
+
+        return new Contract(arguments[1], arguments[0]);
+    }
+
+};
+
+function Contract(abi, address) {
 
     // workaround for invalid assumption that method.name is the full anonymous prototype of the method.
     // it's not. it's just the name. the rest of the code assumes it's actually the anonymous
     // prototype, so we make it so as a workaround.
     // TODO: we may not want to modify input params, maybe use copy instead?
-    desc.forEach(function (method) {
+    abi.forEach(function (method) {
         if (method.name.indexOf('(') === -1) {
             var displayName = method.name;
             var typeName = method.inputs.map(function(i){return i.type; }).join();
@@ -208,12 +232,12 @@ var contract = function (address, desc) {
 
     var result = {};
     addFunctionRelatedPropertiesToContract(result);
-    addFunctionsToContract(result, desc, address);
-    addEventRelatedPropertiesToContract(result, desc, address);
-    addEventsToContract(result, desc, address);
+    addFunctionsToContract(result, abi, address);
+    addEventRelatedPropertiesToContract(result, abi, address);
+    addEventsToContract(result, abi, address);
 
     return result;
-};
+}
 
 module.exports = contract;
 
diff --git a/libjsqrc/ethereumjs/lib/db.js b/libjsqrc/ethereumjs/lib/web3/db.js
similarity index 84%
rename from libjsqrc/ethereumjs/lib/db.js
rename to libjsqrc/ethereumjs/lib/web3/db.js
index 5f5ebc2b1..0db0bb79a 100644
--- a/libjsqrc/ethereumjs/lib/db.js
+++ b/libjsqrc/ethereumjs/lib/web3/db.js
@@ -20,13 +20,14 @@
  * @date 2015
  */
 
+
 /// @returns an array of objects describing web3.db api methods
 var methods = function () {
     return [
-    { name: 'put', call: 'db_put' },
-    { name: 'get', call: 'db_get' },
-    { name: 'putString', call: 'db_putString' },
-    { name: 'getString', call: 'db_getString' }
+    { name: 'putString', call: 'db_putString'},
+    { name: 'getString', call: 'db_getString'},
+    { name: 'putHex', call: 'db_putHex'},
+    { name: 'getHex', call: 'db_getHex'}
     ];
 };
 
diff --git a/libjsqrc/ethereumjs/lib/web3/eth.js b/libjsqrc/ethereumjs/lib/web3/eth.js
new file mode 100644
index 000000000..cfb4280e0
--- /dev/null
+++ b/libjsqrc/ethereumjs/lib/web3/eth.js
@@ -0,0 +1,148 @@
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js 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 Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file eth.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Fabian Vogelsteller <fabian@ethdev.com>
+ * @date 2015
+ */
+
+/**
+ * Web3
+ * 
+ * @module web3
+ */
+
+/**
+ * Eth methods and properties
+ *
+ * An example method object can look as follows:
+ *
+ *      {
+ *      name: 'getBlock',
+ *      call: blockCall,
+ *      outputFormatter: formatters.outputBlockFormatter,
+ *      inputFormatter: [ // can be a formatter funciton or an array of functions. Where each item in the array will be used for one parameter
+ *           utils.toHex, // formats paramter 1
+ *           function(param){ if(!param) return false; } // formats paramter 2
+ *         ]
+ *       },
+ *
+ * @class [web3] eth
+ * @constructor
+ */
+
+
+var formatters = require('./formatters');
+var utils = require('../utils/utils');
+
+
+var blockCall = function (args) {
+    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? "eth_getBlockByHash" : "eth_getBlockByNumber";
+};
+
+var transactionFromBlockCall = function (args) {
+    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? 'eth_getTransactionByBlockHashAndIndex' : 'eth_getTransactionByBlockNumberAndIndex';
+};
+
+var uncleCall = function (args) {
+    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? 'eth_getUncleByBlockHashAndIndex' : 'eth_getUncleByBlockNumberAndIndex';
+};
+
+var getBlockTransactionCountCall = function (args) {
+    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? 'eth_getBlockTransactionCountByHash' : 'eth_getBlockTransactionCountByNumber';
+};
+
+var uncleCountCall = function (args) {
+    return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? 'eth_getUncleCountByBlockHash' : 'eth_getUncleCountByBlockNumber';
+};
+
+/// @returns an array of objects describing web3.eth api methods
+var methods = [
+    { name: 'getBalance', call: 'eth_getBalance', addDefaultblock: 2,
+        outputFormatter: formatters.convertToBigNumber},
+    { name: 'getStorageAt', call: 'eth_getStorageAt', addDefaultblock: 3,
+        inputFormatter: utils.toHex},
+	{ name: 'getCode', call: 'eth_getCode', addDefaultblock: 2},
+    { name: 'getBlock', call: blockCall,
+        outputFormatter: formatters.outputBlockFormatter,
+        inputFormatter: [utils.toHex, function(param){ return (!param) ? false : true; }]},
+    { name: 'getUncle', call: uncleCall,
+        outputFormatter: formatters.outputBlockFormatter,
+        inputFormatter: [utils.toHex, utils.toHex, function(param){ return (!param) ? false : true; }]},
+    { name: 'getCompilers', call: 'eth_getCompilers' },
+    { name: 'getBlockTransactionCount', call: getBlockTransactionCountCall,
+        outputFormatter: utils.toDecimal,
+        inputFormatter: utils.toHex },
+    { name: 'getBlockUncleCount', call: uncleCountCall,
+        outputFormatter: utils.toDecimal,
+        inputFormatter: utils.toHex },
+    { name: 'getTransaction', call: 'eth_getTransactionByHash',
+        outputFormatter: formatters.outputTransactionFormatter },
+    { name: 'getTransactionFromBlock', call: transactionFromBlockCall,
+        outputFormatter: formatters.outputTransactionFormatter,
+        inputFormatter: utils.toHex },
+    { name: 'getTransactionCount', call: 'eth_getTransactionCount', addDefaultblock: 2,
+        outputFormatter: utils.toDecimal},
+    { name: 'sendTransaction', call: 'eth_sendTransaction',
+        inputFormatter: formatters.inputTransactionFormatter },
+    { name: 'call', call: 'eth_call', addDefaultblock: 2,
+        inputFormatter: formatters.inputCallFormatter },
+    { name: 'compile.solidity', call: 'eth_compileSolidity' },
+    { name: 'compile.lll', call: 'eth_compileLLL', inputFormatter: utils.toHex },
+    { name: 'compile.serpent', call: 'eth_compileSerpent', inputFormatter: utils.toHex },
+    { name: 'flush', call: 'eth_flush' },
+
+    // deprecated methods
+    { name: 'balanceAt', call: 'eth_balanceAt', newMethod: 'eth.getBalance' },
+    { name: 'stateAt', call: 'eth_stateAt', newMethod: 'eth.getStorageAt' },
+    { name: 'storageAt', call: 'eth_storageAt', newMethod: 'eth.getStorage' },
+    { name: 'countAt', call: 'eth_countAt', newMethod: 'eth.getTransactionCount' },
+	{ name: 'codeAt', call: 'eth_codeAt', newMethod: 'eth.getCode' },
+    { name: 'transact', call: 'eth_transact', newMethod: 'eth.sendTransaction' },
+    { name: 'block', call: blockCall, newMethod: 'eth.getBlock' },
+    { name: 'transaction', call: transactionFromBlockCall, newMethod: 'eth.getTransaction' },
+    { name: 'uncle', call: uncleCall, newMethod: 'eth.getUncle' },
+    { name: 'compilers', call: 'eth_compilers', newMethod: 'eth.getCompilers' },
+    { name: 'solidity', call: 'eth_solidity', newMethod: 'eth.compile.solidity' },
+    { name: 'lll', call: 'eth_lll', newMethod: 'eth.compile.lll' },
+    { name: 'serpent', call: 'eth_serpent', newMethod: 'eth.compile.serpent' },
+    { name: 'transactionCount', call: getBlockTransactionCountCall, newMethod: 'eth.getBlockTransactionCount' },
+    { name: 'uncleCount', call: uncleCountCall, newMethod: 'eth.getBlockUncleCount' },
+    { name: 'logs', call: 'eth_logs' }
+];
+
+/// @returns an array of objects describing web3.eth api properties
+var properties = [
+    { name: 'coinbase', getter: 'eth_coinbase'},
+    { name: 'mining', getter: 'eth_mining'},
+    { name: 'gasPrice', getter: 'eth_gasPrice', outputFormatter: formatters.convertToBigNumber},
+    { name: 'accounts', getter: 'eth_accounts' },
+    { name: 'blockNumber', getter: 'eth_blockNumber', outputFormatter: utils.toDecimal},
+
+    // deprecated properties
+    { name: 'listening', getter: 'net_listening', setter: 'eth_setListening', newProperty: 'net.listening'},
+    { name: 'peerCount', getter: 'net_peerCount', newProperty: 'net.peerCount'},
+    { name: 'number', getter: 'eth_number', newProperty: 'eth.blockNumber'}
+];
+
+
+module.exports = {
+    methods: methods,
+    properties: properties
+};
+
diff --git a/libjsqrc/ethereumjs/lib/event.js b/libjsqrc/ethereumjs/lib/web3/event.js
similarity index 89%
rename from libjsqrc/ethereumjs/lib/event.js
rename to libjsqrc/ethereumjs/lib/web3/event.js
index 81344c24b..15822705d 100644
--- a/libjsqrc/ethereumjs/lib/event.js
+++ b/libjsqrc/ethereumjs/lib/web3/event.js
@@ -20,8 +20,8 @@
  * @date 2014
  */
 
-var abi = require('./abi');
-var utils = require('./utils');
+var abi = require('../solidity/abi');
+var utils = require('../utils/utils');
 var signature = require('./signature');
 
 /// filter inputs array && returns only indexed (or not) inputs
@@ -63,14 +63,14 @@ var indexedParamsToTopics = function (event, indexed) {
 
 var inputParser = function (address, sign, event) {
     
-    // valid options are 'earliest', 'latest', 'offset' and 'max', as defined for 'eth.watch'
+    // valid options are 'earliest', 'latest', 'offset' and 'max', as defined for 'eth.filter'
     return function (indexed, options) {
         var o = options || {};
         o.address = address;
-        o.topic = [];
-        o.topic.push(sign);
+        o.topics = [];
+        o.topics.push(sign);
         if (indexed) {
-            o.topic = o.topic.concat(indexedParamsToTopics(event, indexed));
+            o.topics = o.topics.concat(indexedParamsToTopics(event, indexed));
         }
         return o;
     };
@@ -102,12 +102,12 @@ var outputParser = function (event) {
         };
 
         output.topics = output.topic; // fallback for go-ethereum
-        if (!output.topic) {
+        if (!output.topics) {
             return result;
         }
        
         var indexedOutputs = filterInputs(event.inputs, true);
-        var indexedData = "0x" + output.topic.slice(1, output.topic.length).map(function (topic) { return topic.slice(2); }).join("");
+        var indexedData = "0x" + output.topics.slice(1, output.topics.length).map(function (topics) { return topics.slice(2); }).join("");
         var indexedRes = abi.formatOutput(indexedOutputs, indexedData);
 
         var notIndexedOutputs = filterInputs(event.inputs, false);
@@ -122,7 +122,7 @@ var outputParser = function (event) {
 var getMatchingEvent = function (events, payload) {
     for (var i = 0; i < events.length; i++) {
         var sign = signature.eventSignatureFromAscii(events[i].name); 
-        if (sign === payload.topic[0]) {
+        if (sign === payload.topics[0]) {
             return events[i];
         }
     }
diff --git a/libjsqrc/ethereumjs/lib/filter.js b/libjsqrc/ethereumjs/lib/web3/filter.js
similarity index 50%
rename from libjsqrc/ethereumjs/lib/filter.js
rename to libjsqrc/ethereumjs/lib/web3/filter.js
index 187eb125c..9b5666373 100644
--- a/libjsqrc/ethereumjs/lib/filter.js
+++ b/libjsqrc/ethereumjs/lib/web3/filter.js
@@ -19,16 +19,19 @@
  *   Jeffrey Wilcke <jeff@ethdev.com>
  *   Marek Kotewicz <marek@ethdev.com>
  *   Marian Oancea <marian@ethdev.com>
+ *   Fabian Vogelsteller <fabian@ethdev.com>
  *   Gav Wood <g@ethdev.com>
  * @date 2014
  */
 
+var utils = require('../utils/utils');
+
 /// Should be called to check if filter implementation is valid
 /// @returns true if it is, otherwise false
 var implementationIsValid = function (i) {
     return !!i && 
         typeof i.newFilter === 'function' && 
-        typeof i.getMessages === 'function' && 
+        typeof i.getLogs === 'function' && 
         typeof i.uninstallFilter === 'function' &&
         typeof i.startPolling === 'function' &&
         typeof i.stopPolling === 'function';
@@ -38,25 +41,56 @@ var implementationIsValid = function (i) {
 /// @param should be string or object
 /// @returns options string or object
 var getOptions = function (options) {
+    /*jshint maxcomplexity:9 */
+
     if (typeof options === 'string') {
         return options;
     } 
 
     options = options || {};
 
-    if (options.topics) {
-        console.warn('"topics" is deprecated, is "topic" instead');
+    if (options.topic) {
+        console.warn('"topic" is deprecated, is "topics" instead');
+        options.topics = options.topic;
+    }
+
+    if (options.earliest) {
+        console.warn('"earliest" is deprecated, is "fromBlock" instead');
+        options.fromBlock = options.earliest;
+    }
+
+    if (options.latest) {
+        console.warn('"latest" is deprecated, is "toBlock" instead');
+        options.toBlock = options.latest;
+    }
+
+    if (options.skip) {
+        console.warn('"skip" is deprecated, is "offset" instead');
+        options.offset = options.skip;
+    }
+
+    if (options.max) {
+        console.warn('"max" is deprecated, is "limit" instead');
+        options.limit = options.max;
     }
 
+    // make sure topics, get converted to hex
+    if(options.topics instanceof Array) {
+        options.topics = options.topics.map(function(topic){
+            return utils.toHex(topic);
+        });
+    }
+
+
     // evaluate lazy properties
     return {
+        fromBlock: utils.toHex(options.fromBlock),
+        toBlock: utils.toHex(options.toBlock),
+        limit: utils.toHex(options.limit),
+        offset: utils.toHex(options.offset),
         to: options.to,
-        topic: options.topic,
-        earliest: options.earliest,
-        latest: options.latest,
-        max: options.max,
-        skip: options.skip,
-        address: options.address
+        address: options.address,
+        topics: options.topics
     };
 };
 
@@ -74,6 +108,8 @@ var filter = function(options, implementation, formatter) {
     options = getOptions(options);
     var callbacks = [];
     var filterId = implementation.newFilter(options);
+
+    // call the callbacks
     var onMessages = function (messages) {
         messages.forEach(function (message) {
             message = formatter ? formatter(message) : message;
@@ -85,27 +121,54 @@ var filter = function(options, implementation, formatter) {
 
     implementation.startPolling(filterId, onMessages, implementation.uninstallFilter);
 
-    var changed = function (callback) {
+    var watch = function(callback) {
         callbacks.push(callback);
     };
 
-    var messages = function () {
-        return implementation.getMessages(filterId);
-    };
-    
-    var uninstall = function () {
+    var stopWatching = function() {
         implementation.stopPolling(filterId);
         implementation.uninstallFilter(filterId);
         callbacks = [];
     };
 
+    var get = function () {
+        var results = implementation.getLogs(filterId);
+
+        return utils.isArray(results) ? results.map(function(message){
+                return formatter ? formatter(message) : message;
+            }) : results;
+    };
+    
     return {
-        changed: changed,
-        arrived: changed,
-        happened: changed,
-        messages: messages,
-        logs: messages,
-        uninstall: uninstall
+        watch: watch,
+        stopWatching: stopWatching,
+        get: get,
+
+        // DEPRECATED methods
+        changed:  function(){
+            console.warn('watch().changed() is deprecated please use filter().watch() instead.');
+            return watch.apply(this, arguments);
+        },
+        arrived:  function(){
+            console.warn('watch().arrived() is deprecated please use filter().watch() instead.');
+            return watch.apply(this, arguments);
+        },
+        happened:  function(){
+            console.warn('watch().happened() is deprecated please use filter().watch() instead.');
+            return watch.apply(this, arguments);
+        },
+        uninstall: function(){
+            console.warn('watch().uninstall() is deprecated please use filter().stopWatching() instead.');
+            return stopWatching.apply(this, arguments);
+        },
+        messages: function(){
+            console.warn('watch().messages() is deprecated please use filter().get() instead.');
+            return get.apply(this, arguments);
+        },
+        logs: function(){
+            console.warn('watch().logs() is deprecated please use filter().get() instead.');
+            return get.apply(this, arguments);
+        }
     };
 };
 
diff --git a/libjsqrc/ethereumjs/lib/web3/formatters.js b/libjsqrc/ethereumjs/lib/web3/formatters.js
new file mode 100644
index 000000000..0c3d1d6a4
--- /dev/null
+++ b/libjsqrc/ethereumjs/lib/web3/formatters.js
@@ -0,0 +1,203 @@
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js 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 Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file formatters.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Fabian Vogelsteller <fabian@ethdev.com>
+ * @date 2015
+ */
+
+var utils = require('../utils/utils');
+
+/**
+ * Should the input to a big number
+ *
+ * @method convertToBigNumber
+ * @param {String|Number|BigNumber}
+ * @returns {BigNumber} object
+ */
+var convertToBigNumber = function (value) {
+    return utils.toBigNumber(value);
+};
+
+/**
+ * Formats the input of a transaction and converts all values to HEX
+ *
+ * @method inputTransactionFormatter
+ * @param {Object} transaction options
+ * @returns object
+*/
+var inputTransactionFormatter = function (options){
+
+    // make code -> data
+    if (options.code) {
+        options.data = options.code;
+        delete options.code;
+    }
+
+    ['gasPrice', 'gas', 'value'].forEach(function(key){
+        options[key] = utils.fromDecimal(options[key]);
+    });
+
+    return options;
+};
+
+/**
+ * Formats the output of a transaction to its proper values
+ * 
+ * @method outputTransactionFormatter
+ * @param {Object} transaction
+ * @returns {Object} transaction
+*/
+var outputTransactionFormatter = function (tx){
+    tx.gas = utils.toDecimal(tx.gas);
+    tx.gasPrice = utils.toBigNumber(tx.gasPrice);
+    tx.value = utils.toBigNumber(tx.value);
+    return tx;
+};
+
+/**
+ * Formats the input of a call and converts all values to HEX
+ *
+ * @method inputCallFormatter
+ * @param {Object} transaction options
+ * @returns object
+*/
+var inputCallFormatter = function (options){
+
+    // make code -> data
+    if (options.code) {
+        options.data = options.code;
+        delete options.code;
+    }
+
+    return options;
+};
+
+
+/**
+ * Formats the output of a block to its proper values
+ *
+ * @method outputBlockFormatter
+ * @param {Object} block object 
+ * @returns {Object} block object
+*/
+var outputBlockFormatter = function(block){
+
+    // transform to number
+    block.gasLimit = utils.toDecimal(block.gasLimit);
+    block.gasUsed = utils.toDecimal(block.gasUsed);
+    block.size = utils.toDecimal(block.size);
+    block.timestamp = utils.toDecimal(block.timestamp);
+    block.number = utils.toDecimal(block.number);
+
+    block.minGasPrice = utils.toBigNumber(block.minGasPrice);
+    block.difficulty = utils.toBigNumber(block.difficulty);
+    block.totalDifficulty = utils.toBigNumber(block.totalDifficulty);
+
+    if(block.transactions instanceof Array) {
+        block.transactions.forEach(function(item){
+            if(!utils.isString(item))
+                return outputTransactionFormatter(item);
+        });
+    }
+
+    return block;
+};
+
+/**
+ * Formats the output of a log
+ * 
+ * @method outputLogFormatter
+ * @param {Object} log object
+ * @returns {Object} log
+*/
+var outputLogFormatter = function(log){
+    log.blockNumber = utils.toDecimal(log.blockNumber);
+    log.transactionIndex = utils.toDecimal(log.transactionIndex);
+    log.logIndex = utils.toDecimal(log.logIndex);
+
+    return log;
+};
+
+
+/**
+ * Formats the input of a whisper post and converts all values to HEX
+ *
+ * @method inputPostFormatter
+ * @param {Object} transaction object
+ * @returns {Object}
+*/
+var inputPostFormatter = function(post){
+
+    post.payload = utils.toHex(post.payload);
+    post.ttl = utils.fromDecimal(post.ttl);
+    post.priority = utils.fromDecimal(post.priority);
+
+    if(!(post.topics instanceof Array))
+        post.topics = [post.topics];
+
+
+    // format the following options
+    post.topics = post.topics.map(function(topic){
+        return utils.fromAscii(topic);
+    });
+
+    return post;
+};
+
+/**
+ * Formats the output of a received post message
+ *
+ * @method outputPostFormatter
+ * @param {Object}
+ * @returns {Object}
+ */
+var outputPostFormatter = function(post){
+
+    post.expiry = utils.toDecimal(post.expiry);
+    post.sent = utils.toDecimal(post.sent);
+    post.ttl = utils.toDecimal(post.ttl);
+    post.workProved = utils.toDecimal(post.workProved);
+    post.payloadRaw = post.payload;
+    post.payload = utils.toAscii(post.payload);
+
+    if(post.payload.indexOf('{') === 0 || post.payload.indexOf('[') === 0) {
+        try {
+            post.payload = JSON.parse(post.payload);
+        } catch (e) { }
+    }
+
+    // format the following options
+    post.topics = post.topics.map(function(topic){
+        return utils.toAscii(topic);
+    });
+
+    return post;
+};
+
+module.exports = {
+    convertToBigNumber: convertToBigNumber,
+    inputTransactionFormatter: inputTransactionFormatter,
+    outputTransactionFormatter: outputTransactionFormatter,
+    inputCallFormatter: inputCallFormatter,
+    outputBlockFormatter: outputBlockFormatter,
+    outputLogFormatter: outputLogFormatter,
+    inputPostFormatter: inputPostFormatter,
+    outputPostFormatter: outputPostFormatter
+};
+
diff --git a/libjsqrc/ethereumjs/lib/web3/httpprovider.js b/libjsqrc/ethereumjs/lib/web3/httpprovider.js
new file mode 100644
index 000000000..8e1daa5c7
--- /dev/null
+++ b/libjsqrc/ethereumjs/lib/web3/httpprovider.js
@@ -0,0 +1,69 @@
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js 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 Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file httpprovider.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Marian Oancea <marian@ethdev.com>
+ *   Fabian Vogelsteller <fabian@ethdev.com>
+ * @date 2014
+ */
+
+if (process.env.NODE_ENV !== 'build') {
+        var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line
+}
+
+var HttpProvider = function (host) {
+    this.name  = 'HTTP';
+    this.handlers = [];
+    this.host = host || 'http://localhost:8080';
+};
+
+HttpProvider.prototype.send = function (payload, callback) {
+    var request = new XMLHttpRequest();
+
+    // ASYNC
+    if(typeof callback === 'function') {
+        request.onreadystatechange = function() {
+            if(request.readyState === 4) {
+                var result = '';
+                try {
+                    result = JSON.parse(request.responseText);
+                } catch(error) {
+                    result = error;
+                }
+                callback(result, request.status);
+            }
+        };
+
+        request.open('POST', this.host, true);
+        request.send(JSON.stringify(payload));
+
+    // SYNC
+    } else {
+        request.open('POST', this.host, false);
+        request.send(JSON.stringify(payload));
+
+        // check request.status
+        if(request.status !== 200)
+            return;
+        return JSON.parse(request.responseText);
+        
+    }
+};
+
+module.exports = HttpProvider;
+
diff --git a/libjsqrc/ethereumjs/lib/jsonrpc.js b/libjsqrc/ethereumjs/lib/web3/jsonrpc.js
similarity index 100%
rename from libjsqrc/ethereumjs/lib/jsonrpc.js
rename to libjsqrc/ethereumjs/lib/web3/jsonrpc.js
diff --git a/libjsqrc/ethereumjs/lib/web3/net.js b/libjsqrc/ethereumjs/lib/web3/net.js
new file mode 100644
index 000000000..e2a4b0533
--- /dev/null
+++ b/libjsqrc/ethereumjs/lib/web3/net.js
@@ -0,0 +1,41 @@
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js 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 Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file eth.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ * @date 2015
+ */
+
+var utils = require('../utils/utils');
+
+/// @returns an array of objects describing web3.eth api methods
+var methods = [
+    // { name: 'getBalance', call: 'eth_balanceAt', outputFormatter: formatters.convertToBigNumber},
+];
+
+/// @returns an array of objects describing web3.eth api properties
+var properties = [
+    { name: 'listening', getter: 'net_listening'},
+    { name: 'peerCount', getter: 'net_peerCount', outputFormatter: utils.toDecimal },
+];
+
+
+module.exports = {
+    methods: methods,
+    properties: properties
+};
+
diff --git a/libjsqrc/ethereumjs/lib/qtsync.js b/libjsqrc/ethereumjs/lib/web3/qtsync.js
similarity index 100%
rename from libjsqrc/ethereumjs/lib/qtsync.js
rename to libjsqrc/ethereumjs/lib/web3/qtsync.js
diff --git a/libjsqrc/ethereumjs/lib/web3/requestmanager.js b/libjsqrc/ethereumjs/lib/web3/requestmanager.js
new file mode 100644
index 000000000..345aaf658
--- /dev/null
+++ b/libjsqrc/ethereumjs/lib/web3/requestmanager.js
@@ -0,0 +1,161 @@
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js 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 Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file requestmanager.js
+ * @authors:
+ *   Jeffrey Wilcke <jeff@ethdev.com>
+ *   Marek Kotewicz <marek@ethdev.com>
+ *   Marian Oancea <marian@ethdev.com>
+ *   Fabian Vogelsteller <fabian@ethdev.com>
+ *   Gav Wood <g@ethdev.com>
+ * @date 2014
+ */
+
+var jsonrpc = require('./jsonrpc');
+var c = require('../utils/config');
+
+/**
+ * It's responsible for passing messages to providers
+ * It's also responsible for polling the ethereum node for incoming messages
+ * Default poll timeout is 1 second
+ */
+var requestManager = function() {
+    var polls = [];
+    var timeout = null;
+    var provider;
+
+    var send = function (data, callback) {
+        /*jshint maxcomplexity: 8 */
+
+        // FORMAT BASED ON ONE FORMATTER function
+        if(typeof data.inputFormatter === 'function') {
+            data.params = Array.prototype.map.call(data.params, function(item, index){
+                // format everything besides the defaultblock, which is already formated
+                return (!data.addDefaultblock || index+1 < data.addDefaultblock) ? data.inputFormatter(item) : item;
+            });
+
+        // FORMAT BASED ON the input FORMATTER ARRAY
+        } else if(data.inputFormatter instanceof Array) {
+            data.params = Array.prototype.map.call(data.inputFormatter, function(formatter, index){
+                // format everything besides the defaultblock, which is already formated
+                return (!data.addDefaultblock || index+1 < data.addDefaultblock) ? formatter(data.params[index]) : data.params[index];
+            });
+        }
+
+
+        var payload = jsonrpc.toPayload(data.method, data.params);
+        
+        if (!provider) {
+            console.error('provider is not set');
+            return null;
+        }
+
+        // HTTP ASYNC (only when callback is given, and it a HttpProvidor)
+        if(typeof callback === 'function' && provider.name === 'HTTP'){
+            provider.send(payload, function(result, status){
+
+                if (!jsonrpc.isValidResponse(result)) {
+                    if(typeof result === 'object' && result.error && result.error.message) {
+                        console.error(result.error.message);
+                        callback(result.error);
+                    } else {
+                        callback(new Error({
+                            status: status,
+                            error: result,
+                            message: 'Bad Request'
+                        }));
+                    }
+                    return null;
+                }
+
+                // format the output
+                callback(null, (typeof data.outputFormatter === 'function') ? data.outputFormatter(result.result) : result.result);
+            });
+
+        // SYNC
+        } else {
+            var result = provider.send(payload);
+
+            if (!jsonrpc.isValidResponse(result)) {
+                if(typeof result === 'object' && result.error && result.error.message)
+                    console.error(result.error.message);
+                return null;
+            }
+
+            // format the output
+            return (typeof data.outputFormatter === 'function') ? data.outputFormatter(result.result) : result.result;
+        }
+        
+    };
+
+    var setProvider = function (p) {
+        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--;) {
+            var poll = polls[i];
+            if (poll.id === pollId) {
+                polls.splice(i, 1);
+            }
+        }
+    };
+
+    var reset = function () {
+        polls.forEach(function (poll) {
+            poll.uninstall(poll.id); 
+        });
+        polls = [];
+
+        if (timeout) {
+            clearTimeout(timeout);
+            timeout = null;
+        }
+        poll();
+    };
+
+    var poll = function () {
+        polls.forEach(function (data) {
+            // send async
+            send(data.data, function(error, result){
+                if (!(result instanceof Array) || result.length === 0) {
+                    return;
+                }
+                data.callback(result);
+            });
+        });
+        timeout = setTimeout(poll, c.ETH_POLLING_TIMEOUT);
+    };
+    
+    poll();
+
+    return {
+        send: send,
+        setProvider: setProvider,
+        startPolling: startPolling,
+        stopPolling: stopPolling,
+        reset: reset
+    };
+};
+
+module.exports = requestManager;
+
diff --git a/libjsqrc/ethereumjs/lib/shh.js b/libjsqrc/ethereumjs/lib/web3/shh.js
similarity index 75%
rename from libjsqrc/ethereumjs/lib/shh.js
rename to libjsqrc/ethereumjs/lib/web3/shh.js
index 563e71d27..c48bae90e 100644
--- a/libjsqrc/ethereumjs/lib/shh.js
+++ b/libjsqrc/ethereumjs/lib/web3/shh.js
@@ -20,14 +20,19 @@
  * @date 2015
  */
 
+var formatters = require('./formatters');
+
 /// @returns an array of objects describing web3.shh api methods
 var methods = function () {
     return [
-    { name: 'post', call: 'shh_post' },
+    { name: 'post', call: 'shh_post', inputFormatter: formatters.inputPostFormatter },
     { name: 'newIdentity', call: 'shh_newIdentity' },
-    { name: 'haveIdentity', call: 'shh_haveIdentity' },
+    { name: 'hasIdentity', call: 'shh_hasIdentity' },
     { name: 'newGroup', call: 'shh_newGroup' },
-    { name: 'addToGroup', call: 'shh_addToGroup' }
+    { name: 'addToGroup', call: 'shh_addToGroup' },
+
+    // deprecated
+    { name: 'haveIdentity', call: 'shh_haveIdentity', newMethod: 'shh.hasIdentity' },
     ];
 };
 
diff --git a/libjsqrc/ethereumjs/lib/signature.js b/libjsqrc/ethereumjs/lib/web3/signature.js
similarity index 95%
rename from libjsqrc/ethereumjs/lib/signature.js
rename to libjsqrc/ethereumjs/lib/web3/signature.js
index 511762166..44ecf1f31 100644
--- a/libjsqrc/ethereumjs/lib/signature.js
+++ b/libjsqrc/ethereumjs/lib/web3/signature.js
@@ -20,8 +20,8 @@
  * @date 2015
  */
 
-var web3 = require('./web3'); 
-var c = require('./const');
+var web3 = require('../web3'); 
+var c = require('../utils/config');
 
 /// @param function name for which we want to get signature
 /// @returns signature of function with given name
diff --git a/libjsqrc/ethereumjs/lib/watches.js b/libjsqrc/ethereumjs/lib/web3/watches.js
similarity index 83%
rename from libjsqrc/ethereumjs/lib/watches.js
rename to libjsqrc/ethereumjs/lib/web3/watches.js
index 84ff38922..bcb472553 100644
--- a/libjsqrc/ethereumjs/lib/watches.js
+++ b/libjsqrc/ethereumjs/lib/web3/watches.js
@@ -20,16 +20,16 @@
  * @date 2015
  */
 
-/// @returns an array of objects describing web3.eth.watch api methods
+/// @returns an array of objects describing web3.eth.filter api methods
 var eth = function () {
     var newFilter = function (args) {
-        return typeof args[0] === 'string' ? 'eth_newFilterString' : 'eth_newFilter';
+        return typeof args[0] === 'string' ? 'eth_newBlockFilter' : 'eth_newFilter';
     };
 
     return [
     { name: 'newFilter', call: newFilter },
     { name: 'uninstallFilter', call: 'eth_uninstallFilter' },
-    { name: 'getMessages', call: 'eth_filterLogs' }
+    { name: 'getLogs', call: 'eth_getFilterLogs' }
     ];
 };
 
@@ -38,7 +38,7 @@ var shh = function () {
     return [
     { name: 'newFilter', call: 'shh_newFilter' },
     { name: 'uninstallFilter', call: 'shh_uninstallFilter' },
-    { name: 'getMessages', call: 'shh_getMessages' }
+    { name: 'getLogs', call: 'shh_getMessages' }
     ];
 };
 
diff --git a/libjsqrc/ethereumjs/package-init.js b/libjsqrc/ethereumjs/package-init.js
new file mode 100644
index 000000000..bbad82ac7
--- /dev/null
+++ b/libjsqrc/ethereumjs/package-init.js
@@ -0,0 +1,7 @@
+/* jshint ignore:start */
+
+if(typeof web3 === 'undefined') {
+    web3 = require('web3');
+}
+
+/* jshint ignore:end */
\ No newline at end of file
diff --git a/libjsqrc/ethereumjs/package.js b/libjsqrc/ethereumjs/package.js
new file mode 100644
index 000000000..f4bc32631
--- /dev/null
+++ b/libjsqrc/ethereumjs/package.js
@@ -0,0 +1,29 @@
+/* jshint ignore:start */
+Package.describe({
+  name: 'ethereum:js',
+  version: '0.1.3',
+  summary: 'Ethereum JavaScript API, middleware to talk to a ethreum node over RPC',
+  git: 'https://github.com/ethereum/ethereum.js',
+  // By default, Meteor will default to using README.md for documentation.
+  // To avoid submitting documentation, set this field to null.
+  documentation: 'README.md'
+});
+
+Package.onUse(function(api) {
+  api.versionsFrom('1.0.3.2');
+
+  api.use('3stack:bignumber@2.0.0', 'client');
+
+  api.export('BigNumber', 'client');
+  api.export('web3', 'client');
+
+  api.addFiles('dist/ethereum.js', 'client');
+  api.addFiles('package-init.js', 'client');
+});
+
+// Package.onTest(function(api) {
+//   api.use('tinytest');
+//   api.use('test');
+//   api.addFiles('test-tests.js');
+// });
+/* jshint ignore:end */
diff --git a/libjsqrc/ethereumjs/package.json b/libjsqrc/ethereumjs/package.json
index 340200d0d..258eb5d1d 100644
--- a/libjsqrc/ethereumjs/package.json
+++ b/libjsqrc/ethereumjs/package.json
@@ -1,41 +1,49 @@
 {
   "name": "ethereum.js",
   "namespace": "ethereum",
-  "version": "0.0.16",
-  "description": "Ethereum Compatible JavaScript API",
+  "version": "0.1.3",
+  "description": "Ethereum JavaScript API, middleware to talk to a ethreum node over RPC",
   "main": "./index.js",
   "directories": {
     "lib": "./lib"
   },
   "dependencies": {
     "bignumber.js": ">=2.0.0",
+    "envify": "^3.0.0",
+    "unreachable-branch-transform": "^0.1.0",
     "xmlhttprequest": "*"
   },
   "devDependencies": {
     "bower": ">=1.3.0",
     "browserify": ">=6.0",
+    "chai": "^2.1.1",
     "coveralls": "^2.11.2",
     "del": ">=0.1.1",
-    "envify": "^3.0.0",
     "exorcist": "^0.1.6",
     "gulp": ">=3.4.0",
     "gulp-jshint": ">=1.5.0",
     "gulp-rename": ">=1.2.0",
+    "gulp-replace": "^0.5.3",
     "gulp-streamify": "0.0.5",
     "gulp-uglify": ">=1.0.0",
     "istanbul": "^0.3.5",
     "jshint": ">=2.5.0",
+    "karma": "^0.12.31",
+    "karma-browserify": "^4.0.0",
+    "karma-chrome-launcher": "^0.1.7",
+    "karma-firefox-launcher": "^0.1.4",
+    "karma-mocha": "^0.1.10",
+    "karma-safari-launcher": "^0.1.1",
     "mocha": ">=2.1.0",
-    "mocha-lcov-reporter": "0.0.1",
-    "unreachable-branch-transform": "^0.1.0",
     "vinyl-source-stream": "^1.0.0"
   },
   "scripts": {
     "build": "gulp",
     "watch": "gulp watch",
-    "lint": "gulp lint",
+    "lint": "jshint *.js lib",
     "test": "mocha",
-    "test-coveralls": "istanbul cover _mocha -- -R spec && cat coverage/lcov.info | coveralls --verbose"
+    "test-coveralls": "istanbul cover _mocha -- -R spec && cat coverage/lcov.info | coveralls --verbose",
+    "karma": "./node_modules/karma/bin/karma start --singleRun=true --browsers=\"Firefox\""
   },
   "repository": {
     "type": "git",
@@ -45,6 +53,19 @@
   "bugs": {
     "url": "https://github.com/ethereum/ethereum.js/issues"
   },
+  "browserify": {
+    "transform": [
+      [
+        "envify",
+        {
+          "NODE_ENV": "build"
+        }
+      ],
+      [
+        "unreachable-branch-transform"
+      ]
+    ]
+  },
   "keywords": [
     "ethereum",
     "javascript",
@@ -66,6 +87,11 @@
       "name": "Marian Oancea",
       "email": "marian@ethdev.com",
       "url": "https://github.com/cubedro"
+    },
+    {
+      "name": "Fabian Vogelsteller",
+      "email": "fabian@frozeman.de",
+      "homepage": "http://frozeman.de"
     }
   ],
   "license": "LGPL-3.0"
diff --git a/libjsqrc/ethereumjs/test/abi.inputParser.js b/libjsqrc/ethereumjs/test/abi.inputParser.js
index edfc2b58f..1d3a869e3 100644
--- a/libjsqrc/ethereumjs/test/abi.inputParser.js
+++ b/libjsqrc/ethereumjs/test/abi.inputParser.js
@@ -1,6 +1,6 @@
 var assert = require('assert');
 var BigNumber = require('bignumber.js');
-var abi = require('../lib/abi.js');
+var abi = require('../lib/solidity/abi.js');
 var clone = function (object) { return JSON.parse(JSON.stringify(object)); };
 
 var description =  [{
@@ -227,56 +227,6 @@ describe('abi', function() {
 
         });
 
-        it('should parse input hash', function() {
-
-            // given
-            var d = clone(description);
-
-            d[0].inputs = [
-                { type: "hash" }
-            ];
-
-            // when
-            var parser = abi.inputParser(d);
-
-            // then
-            assert.equal(parser.test("0x407d73d8a49eeb85d32cf465507dd71d507100c1"), "000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1");
-
-        });
-
-        it('should parse input hash256', function() {
-
-            // given
-            var d = clone(description);
-
-            d[0].inputs = [
-                { type: "hash256" }
-            ];
-
-            // when
-            var parser = abi.inputParser(d);
-
-            // then
-            assert.equal(parser.test("0x407d73d8a49eeb85d32cf465507dd71d507100c1"), "000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1");
-
-        });
-
-
-        it('should parse input hash160', function() {
-            // given
-            var d = clone(description);
-
-            d[0].inputs = [
-                { type: "hash160" }
-            ];
-
-            // when
-            var parser = abi.inputParser(d);
-
-            // then
-            assert.equal(parser.test("0x407d73d8a49eeb85d32cf465507dd71d507100c1"), "000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1");
-        });
-
         it('should parse input address', function () {
 
             // given
@@ -294,13 +244,13 @@ describe('abi', function() {
 
         });
 
-        it('should parse input string', function () {
+        it('should parse input fixed bytes type', function () {
 
             // given
             var d = clone(description);
 
             d[0].inputs = [
-                { type: "string" }
+                { type: "bytes" }
             ];
 
             // when
@@ -318,14 +268,14 @@ describe('abi', function() {
                 );
         });
 
-        it('should parse input int followed by a string', function () {
+        it('should parse input int followed by a fixed bytes type', function () {
 
             // given
             var d = clone(description);
 
             d[0].inputs = [
                 { type: "int" },
-                { type: "string" }
+                { type: "bytes" }
             ];
 
             // when
@@ -340,13 +290,13 @@ describe('abi', function() {
                 );
         });
 
-        it('should parse input string followed by an int', function () {
+        it('should parse input fixed bytes type followed by an int', function () {
 
             // given
             var d = clone(description);
 
             d[0].inputs = [
-                { type: "string" },
+                { type: "bytes" },
                 { type: "int" }
             ];
 
@@ -391,8 +341,8 @@ describe('abi', function() {
             },{
                 name: "test2",
                 type: "function",
-                inputs: [{ type: "string" }],
-                outputs: [{ type: "string" }]
+                inputs: [{ type: "bytes" }],
+                outputs: [{ type: "bytes" }]
             }];
 
             // when
@@ -544,5 +494,21 @@ describe('abi', function() {
 
         });
 
+        it('should throw an incorrect type error', function () {
+
+            // given
+            var d = clone(description);
+            d[0].inputs = [
+                { type: 'uin' }
+            ]
+
+            // when
+            var parser = abi.inputParser(d);
+
+            // then
+            assert.throws(function () {parser.test('0x')}, Error);
+
+        });
+
     });
 });
diff --git a/libjsqrc/ethereumjs/test/abi.outputParser.js b/libjsqrc/ethereumjs/test/abi.outputParser.js
index 723c408f0..955c0d5f1 100644
--- a/libjsqrc/ethereumjs/test/abi.outputParser.js
+++ b/libjsqrc/ethereumjs/test/abi.outputParser.js
@@ -1,6 +1,6 @@
 var assert = require('assert');
 var BigNumber = require('bignumber.js');
-var abi = require('../lib/abi.js');
+var abi = require('../lib/solidity/abi.js');
 var clone = function (object) { return JSON.parse(JSON.stringify(object)); };
 
 var description =  [{
@@ -21,13 +21,13 @@ var description =  [{
 
 describe('abi', function() {
     describe('outputParser', function() {
-        it('should parse output string', function() {
+        it('should parse output fixed bytes type', function() {
 
             // given
             var d = clone(description);
 
             d[0].outputs = [
-                { type: "string" }
+                { type: "bytes" }
             ];
 
             // when
@@ -181,64 +181,6 @@ describe('abi', function() {
             assert.equal(parser.test("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0")[0], -16);
         });
 
-        it('should parse output hash', function() {
-            
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: 'hash' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(
-                parser.test("0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1")[0],
-                "0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1"
-                );
-        });
-        
-        it('should parse output hash256', function() {
-        
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: 'hash256' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(
-                parser.test("0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1")[0],
-                "0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1"
-                );
-        });
-
-        it('should parse output hash160', function() {
-            
-            // given
-            var d = clone(description);
-
-            d[0].outputs = [
-                { type: 'hash160' }
-            ];
-
-            // when
-            var parser = abi.outputParser(d);
-
-            // then
-            assert.equal(
-                parser.test("0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1")[0],
-                "0x000000000000000000000000407d73d8a49eeb85d32cf465507dd71d507100c1"
-                );
-            // TODO shouldnt' the expected hash be shorter?
-        });
-
         it('should parse output address', function() {
             
             // given
@@ -317,14 +259,14 @@ describe('abi', function() {
         });
         
 
-        it('should parse multiple output strings', function() {
+        it('should parse multiple output fixed bytes type', function() {
 
             // given
             var d = clone(description);
 
             d[0].outputs = [
-                { type: "string" },
-                { type: "string" }
+                { type: "bytes" },
+                { type: "bytes" }
             ];
 
             // when
@@ -380,8 +322,8 @@ describe('abi', function() {
             },{
                 name: "test2",
                 type: "function",
-                inputs: [{ type: "string" }],
-                outputs: [{ type: "string" }]
+                inputs: [{ type: "bytes" }],
+                outputs: [{ type: "bytes" }]
             }];
 
             // when
@@ -456,6 +398,22 @@ describe('abi', function() {
 
         });
 
+        it('should throw an incorrect type error', function () {
+
+            // given
+            var d = clone(description);
+            d[0].outputs = [
+                { type: 'uin' }
+            ]
+
+            // when
+            var parser = abi.outputParser(d);
+
+            // then
+            assert.throws(function () {parser.test('0x')}, Error);
+
+        });
+
     });
 });
 
diff --git a/libjsqrc/ethereumjs/test/db.methods.js b/libjsqrc/ethereumjs/test/db.methods.js
index 2ad384579..aac8981d2 100644
--- a/libjsqrc/ethereumjs/test/db.methods.js
+++ b/libjsqrc/ethereumjs/test/db.methods.js
@@ -5,8 +5,8 @@ var u = require('./test.utils.js');
 
 describe('web3', function() {
     describe('db', function() {
-        u.methodExists(web3.db, 'put');
-        u.methodExists(web3.db, 'get');
+        u.methodExists(web3.db, 'putHex');
+        u.methodExists(web3.db, 'getHex');
         u.methodExists(web3.db, 'putString');
         u.methodExists(web3.db, 'getString');
     });
diff --git a/libjsqrc/ethereumjs/test/eth.contract.js b/libjsqrc/ethereumjs/test/eth.contract.js
index 1a92ec88f..59ad51b29 100644
--- a/libjsqrc/ethereumjs/test/eth.contract.js
+++ b/libjsqrc/ethereumjs/test/eth.contract.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var contract = require('../lib/contract.js');
+var contract = require('../lib/web3/contract.js');
 
 describe('contract', function() {
     it('should create simple contract with one method from abi with explicit type name', function () {
@@ -22,11 +22,12 @@ describe('contract', function() {
         }];
     
         // when
-        var con = contract(null, description);
+        var Con = contract(description);
+        var myCon = new Con(null);
 
         // then
-        assert.equal('function', typeof con.test); 
-        assert.equal('function', typeof con.test['uint256']);
+        assert.equal('function', typeof myCon.test); 
+        assert.equal('function', typeof myCon.test['uint256']);
     });
 
     it('should create simple contract with one method from abi with implicit type name', function () {
@@ -49,11 +50,12 @@ describe('contract', function() {
         }];
 
         // when
-        var con = contract(null, description);
+        var Con = contract(description);
+        var myCon = new Con(null);
 
         // then
-        assert.equal('function', typeof con.test); 
-        assert.equal('function', typeof con.test['uint256']);
+        assert.equal('function', typeof myCon.test); 
+        assert.equal('function', typeof myCon.test['uint256']);
     }); 
 
     it('should create contract with multiple methods', function () {
@@ -90,13 +92,14 @@ describe('contract', function() {
         }];
         
         // when
-        var con = contract(null, description);
+        var Con = contract(description);
+        var myCon = new Con(null);
 
         // then
-        assert.equal('function', typeof con.test); 
-        assert.equal('function', typeof con.test['uint256']);
-        assert.equal('function', typeof con.test2); 
-        assert.equal('function', typeof con.test2['uint256']);
+        assert.equal('function', typeof myCon.test); 
+        assert.equal('function', typeof myCon.test['uint256']);
+        assert.equal('function', typeof myCon.test2); 
+        assert.equal('function', typeof myCon.test2['uint256']);
     });
 
     it('should create contract with overloaded methods', function () {
@@ -133,12 +136,13 @@ describe('contract', function() {
         }];
         
         // when
-        var con = contract(null, description);
+        var Con = contract(description);
+        var myCon = new Con(null);
 
         // then
-        assert.equal('function', typeof con.test); 
-        assert.equal('function', typeof con.test['uint256']);
-        assert.equal('function', typeof con.test['string']); 
+        assert.equal('function', typeof myCon.test); 
+        assert.equal('function', typeof myCon.test['uint256']);
+        assert.equal('function', typeof myCon.test['string']); 
     });
 
     it('should create contract with no methods', function () {
@@ -161,10 +165,11 @@ describe('contract', function() {
 
 
         // when
-        var con = contract(null, description);
+        var Con = contract(description);
+        var myCon = new Con(null);
 
         // then
-        assert.equal('undefined', typeof con.test); 
+        assert.equal('undefined', typeof myCon.test); 
 
     });
 
@@ -189,11 +194,12 @@ describe('contract', function() {
 
 
         // when
-        var con = contract(null, description);
+        var Con = contract(description);
+        var myCon = new Con(null);
 
         // then
-        assert.equal('function', typeof con.test); 
-        assert.equal('function', typeof con.test['uint256']); 
+        assert.equal('function', typeof myCon.test); 
+        assert.equal('function', typeof myCon.test['uint256']); 
 
     });
 
diff --git a/libjsqrc/ethereumjs/test/eth.methods.js b/libjsqrc/ethereumjs/test/eth.methods.js
index 9ea0ad59a..7fb8d3b24 100644
--- a/libjsqrc/ethereumjs/test/eth.methods.js
+++ b/libjsqrc/ethereumjs/test/eth.methods.js
@@ -4,33 +4,56 @@ var u = require('./test.utils.js');
 
 describe('web3', function() {
     describe('eth', function() {
-        u.methodExists(web3.eth, 'balanceAt');
-        u.methodExists(web3.eth, 'stateAt');
-        u.methodExists(web3.eth, 'storageAt');
-        u.methodExists(web3.eth, 'countAt');
-        u.methodExists(web3.eth, 'codeAt');
-        u.methodExists(web3.eth, 'transact');
+        u.methodExists(web3.eth, 'getBalance');
+        u.methodExists(web3.eth, 'getStorageAt');
+        u.methodExists(web3.eth, 'getStorage');
+        u.methodExists(web3.eth, 'getTransactionCount');
+		u.methodExists(web3.eth, 'getCode');
+        u.methodExists(web3.eth, 'sendTransaction');
         u.methodExists(web3.eth, 'call');
-        u.methodExists(web3.eth, 'block');
-        u.methodExists(web3.eth, 'transaction');
-        u.methodExists(web3.eth, 'uncle');
-        u.methodExists(web3.eth, 'compilers');
-        u.methodExists(web3.eth, 'lll');
-        u.methodExists(web3.eth, 'solidity');
-        u.methodExists(web3.eth, 'serpent');
-        u.methodExists(web3.eth, 'logs');
-        u.methodExists(web3.eth, 'transactionCount');
-        u.methodExists(web3.eth, 'uncleCount');
+        u.methodExists(web3.eth, 'getBlock');
+        u.methodExists(web3.eth, 'getTransaction');
+        u.methodExists(web3.eth, 'getUncle');
+        u.methodExists(web3.eth, 'getCompilers');
+        u.methodExists(web3.eth.compile, 'lll');
+        u.methodExists(web3.eth.compile, 'solidity');
+        u.methodExists(web3.eth.compile, 'serpent');
+        u.methodExists(web3.eth, 'getBlockTransactionCount');
+        u.methodExists(web3.eth, 'getBlockUncleCount');
+        u.methodExists(web3.eth, 'filter');
+        u.methodExists(web3.eth, 'contract');
 
         u.propertyExists(web3.eth, 'coinbase');
-        u.propertyExists(web3.eth, 'listening');
         u.propertyExists(web3.eth, 'mining');
         u.propertyExists(web3.eth, 'gasPrice');
         u.propertyExists(web3.eth, 'accounts');
-        u.propertyExists(web3.eth, 'peerCount');
         u.propertyExists(web3.eth, 'defaultBlock');
-        u.propertyExists(web3.eth, 'number');
+        u.propertyExists(web3.eth, 'blockNumber');
     });
+
+    // Fail at the moment
+    // describe('eth', function(){
+    //     it('should be a positive balance', function() {
+    //         // when
+    //         var testAddress = '0x50f4ed0e83f9da907017bcfb444e3e25407f59bb';
+    //         var balance = web3.eth.balanceAt(testAddress);
+    //         // then
+    //         assert(balance > 0, 'Balance is ' + balance);
+    //     });
+
+    //     it('should return a block', function() {
+    //         // when
+    //         var block = web3.eth.block(0);
+            
+    //         // then
+    //         assert.notEqual(block, null);
+    //         assert.equal(block.number, 0);
+    //         assert(web3.toDecimal(block.difficulty) > 0);
+    //     });
+    // });
 });
 
 
+
+
+
diff --git a/libjsqrc/ethereumjs/test/event.inputParser.js b/libjsqrc/ethereumjs/test/event.inputParser.js
index 8f9790a2d..a2ce27112 100644
--- a/libjsqrc/ethereumjs/test/event.inputParser.js
+++ b/libjsqrc/ethereumjs/test/event.inputParser.js
@@ -1,6 +1,6 @@
 var assert = require('assert');
-var event = require('../lib/event.js');
-var f = require('../lib/formatters.js');
+var event = require('../lib/web3/event.js');
+var f = require('../lib/solidity/formatters.js');
 
 describe('event', function () {
     describe('inputParser', function () {
@@ -20,8 +20,8 @@ describe('event', function () {
 
             // then
             assert.equal(result.address, address); 
-            assert.equal(result.topic.length, 1);
-            assert.equal(result.topic[0], signature);
+            assert.equal(result.topics.length, 1);
+            assert.equal(result.topics[0], signature);
 
         });
 
@@ -31,10 +31,10 @@ describe('event', function () {
             var address = '0x012345';
             var signature = '0x987654';
             var options = {
-                earliest: 1,
-                latest: 2,
+                fromBlock: 1,
+                toBlock: 2,
                 offset: 3,
-                max: 4
+                limit: 4
             };
             var e = {
                 name: 'Event',
@@ -47,12 +47,12 @@ describe('event', function () {
 
             // then
             assert.equal(result.address, address);
-            assert.equal(result.topic.length, 1);
-            assert.equal(result.topic[0], signature);
-            assert.equal(result.earliest, options.earliest);
-            assert.equal(result.latest, options.latest);
+            assert.equal(result.topics.length, 1);
+            assert.equal(result.topics[0], signature);
+            assert.equal(result.fromBlock, options.fromBlock);
+            assert.equal(result.toBlock, options.toBlock);
             assert.equal(result.offset, options.offset);
-            assert.equal(result.max, options.max);
+            assert.equal(result.limit, options.limit);
         
         });
 
@@ -62,10 +62,10 @@ describe('event', function () {
             var address = '0x012345';
             var signature = '0x987654';
             var options = {
-                earliest: 1,
-                latest: 2,
+                fromBlock: 1,
+                toBlock: 2,
                 offset: 3,
-                max: 4
+                limit: 4
             };
             var e = {
                 name: 'Event',
@@ -78,13 +78,13 @@ describe('event', function () {
 
             // then
             assert.equal(result.address, address);
-            assert.equal(result.topic.length, 2);
-            assert.equal(result.topic[0], signature);
-            assert.equal(result.topic[1], f.formatInputInt(4));
-            assert.equal(result.earliest, options.earliest);
-            assert.equal(result.latest, options.latest);
+            assert.equal(result.topics.length, 2);
+            assert.equal(result.topics[0], signature);
+            assert.equal(result.topics[1], f.formatInputInt(4));
+            assert.equal(result.fromBlock, options.fromBlock);
+            assert.equal(result.toBlock, options.toBlock);
             assert.equal(result.offset, options.offset);
-            assert.equal(result.max, options.max);
+            assert.equal(result.limit, options.limit);
 
         });
 
@@ -110,10 +110,10 @@ describe('event', function () {
 
             // then
             assert.equal(result.address, address);
-            assert.equal(result.topic.length, 2);
-            assert.equal(result.topic[0], signature);
-            assert.equal(result.topic[1][0], f.formatInputInt(4));
-            assert.equal(result.topic[1][1], f.formatInputInt(69));
+            assert.equal(result.topics.length, 2);
+            assert.equal(result.topics[0], signature);
+            assert.equal(result.topics[1][0], f.formatInputInt(4));
+            assert.equal(result.topics[1][1], f.formatInputInt(69));
             assert.equal(result.earliest, options.earliest);
             assert.equal(result.latest, options.latest);
             assert.equal(result.offset, options.offset);
diff --git a/libjsqrc/ethereumjs/test/event.outputParser.js b/libjsqrc/ethereumjs/test/event.outputParser.js
index 22f4ed395..93b50ff2f 100644
--- a/libjsqrc/ethereumjs/test/event.outputParser.js
+++ b/libjsqrc/ethereumjs/test/event.outputParser.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var event = require('../lib/event.js');
+var event = require('../lib/web3/event.js');
 
 describe('event', function () {
     describe('outputParser', function () {
diff --git a/libjsqrc/ethereumjs/test/filter.methods.js b/libjsqrc/ethereumjs/test/filter.methods.js
index 9f81ec38f..d039ec9bb 100644
--- a/libjsqrc/ethereumjs/test/filter.methods.js
+++ b/libjsqrc/ethereumjs/test/filter.methods.js
@@ -1,11 +1,11 @@
 var assert = require('assert');
-var filter = require('../lib/filter');
+var filter = require('../lib/web3/filter');
 var u = require('./test.utils.js');
 
 var empty = function () {};
 var implementation = {
     newFilter: empty,
-    getMessages: empty,
+    getLogs: empty,
     uninstallFilter: empty,
     startPolling: empty,
     stopPolling: empty,
@@ -16,12 +16,9 @@ describe('web3', function () {
         describe('filter', function () {
             var f = filter({}, implementation);
 
-            u.methodExists(f, 'arrived');
-            u.methodExists(f, 'happened');
-            u.methodExists(f, 'changed');
-            u.methodExists(f, 'messages');
-            u.methodExists(f, 'logs');
-            u.methodExists(f, 'uninstall');
+            u.methodExists(f, 'watch');
+            u.methodExists(f, 'stopWatching');
+            u.methodExists(f, 'get');
         });
     });
 });
diff --git a/libjsqrc/ethereumjs/test/formatters.inputPostFormatter.js b/libjsqrc/ethereumjs/test/formatters.inputPostFormatter.js
new file mode 100644
index 000000000..0995d6d79
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/formatters.inputPostFormatter.js
@@ -0,0 +1,28 @@
+var chai = require('chai');
+var formatters = require('../lib/web3/formatters.js');
+var assert = chai.assert;
+
+describe('formatters', function () {
+    describe('inputPostFormatter', function () {
+        it('should return the correct value', function () {
+            
+            // input as strings and numbers
+            assert.deepEqual(formatters.inputPostFormatter({
+                from: '0x00000',
+                to: '0x00000',
+                payload: {test: 'test'},
+                ttl: 200,
+                priority: 1000,
+                topics: ['hello','mytopics']
+            }), {
+                from: '0x00000',
+                to: '0x00000',
+                payload: '0x7b2274657374223a2274657374227d',
+                ttl: '0xc8',
+                priority: '0x3e8',
+                topics: ['0x68656c6c6f','0x6d79746f70696373']
+            });
+
+        });
+    });
+});
diff --git a/libjsqrc/ethereumjs/test/formatters.inputTransactionFormatter.js b/libjsqrc/ethereumjs/test/formatters.inputTransactionFormatter.js
new file mode 100644
index 000000000..5ff0526e1
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/formatters.inputTransactionFormatter.js
@@ -0,0 +1,26 @@
+var assert = require('assert');
+var formatters = require('../lib/web3/formatters.js');
+var BigNumber = require('bignumber.js');
+
+describe('formatters', function () {
+    describe('inputTransactionFormatter', function () {
+        it('should return the correct value', function () {
+            
+            assert.deepEqual(formatters.inputTransactionFormatter({
+                data: '0x34234kjh23kj4234',
+                value: new BigNumber(100),
+                from: '0x00000',
+                to: '0x00000',
+                gas: 1000,
+                gasPrice: new BigNumber(1000),
+            }), {
+                data: '0x34234kjh23kj4234',
+                value: '0x64',
+                from: '0x00000',
+                to: '0x00000',
+                gas: '0x3e8',
+                gasPrice: '0x3e8',
+            });
+        });
+    });
+});
diff --git a/libjsqrc/ethereumjs/test/formatters.outputBlockFormatter.js b/libjsqrc/ethereumjs/test/formatters.outputBlockFormatter.js
new file mode 100644
index 000000000..f31cced99
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/formatters.outputBlockFormatter.js
@@ -0,0 +1,48 @@
+var assert = require('assert');
+var formatters = require('../lib/web3/formatters.js');
+var BigNumber = require('bignumber.js');
+
+describe('formatters', function () {
+    describe('outputBlockFormatter', function () {
+        it('should return the correct value', function () {
+            
+            assert.deepEqual(formatters.outputBlockFormatter({
+                hash: '0x34234kjh23kj4234',
+                parentHash: '0x34234kjh23kj4234',
+                miner: '0x34234kjh23kj4234',
+                stateRoot: '0x34234kjh23kj4234',
+                sha3Uncles: '0x34234kjh23kj4234',
+                bloom: '0x34234kjh23kj4234',
+                difficulty: '0x3e8',
+                totalDifficulty: '0x3e8',
+                number: '0x3e8',
+                minGasPrice: '0x3e8',
+                gasLimit: '0x3e8',
+                gasUsed: '0x3e8',
+                timestamp: '0x3e8',
+                extraData: '0x34234kjh23kj4234',
+                nonce: '0x34234kjh23kj4234',
+                children: ['0x34234kjh23kj4234'],
+                size: '0x3e8'
+            }), {
+                hash: '0x34234kjh23kj4234',
+                parentHash: '0x34234kjh23kj4234',
+                miner: '0x34234kjh23kj4234',
+                stateRoot: '0x34234kjh23kj4234',
+                sha3Uncles: '0x34234kjh23kj4234',
+                bloom: '0x34234kjh23kj4234',
+                difficulty: new BigNumber(1000),
+                totalDifficulty: new BigNumber(1000),
+                number: 1000,
+                minGasPrice: new BigNumber(1000),
+                gasLimit: 1000,
+                gasUsed: 1000,
+                timestamp: 1000,
+                extraData: '0x34234kjh23kj4234',
+                nonce: '0x34234kjh23kj4234',
+                children: ['0x34234kjh23kj4234'],
+                size: 1000
+            });
+        });
+    });
+});
diff --git a/libjsqrc/ethereumjs/test/formatters.outputLogFormatter.js b/libjsqrc/ethereumjs/test/formatters.outputLogFormatter.js
new file mode 100644
index 000000000..495a64620
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/formatters.outputLogFormatter.js
@@ -0,0 +1,27 @@
+var assert = require('assert');
+var formatters = require('../lib/web3/formatters.js');
+
+describe('formatters', function () {
+    describe('outputLogFormatter', function () {
+        it('should return the correct value', function () {
+            
+            assert.deepEqual(formatters.outputLogFormatter({
+                transactionIndex: '0x3e8',
+                logIndex: '0x3e8',
+                blockNumber: '0x3e8',
+                transactionHash: '0x7b2274657374223a2274657374227d',
+                blockHash: '0x7b2274657374223a2274657374227d',
+                data: '0x7b2274657374223a2274657374227d',
+                topics: ['0x68656c6c6f','0x6d79746f70696373']                
+            }), {
+                transactionIndex: 1000,
+                logIndex: 1000,
+                blockNumber: 1000,
+                transactionHash: '0x7b2274657374223a2274657374227d',
+                blockHash: '0x7b2274657374223a2274657374227d',
+                data: '0x7b2274657374223a2274657374227d',
+                topics: ['0x68656c6c6f','0x6d79746f70696373']
+            });
+        });
+    });
+});
diff --git a/libjsqrc/ethereumjs/test/formatters.outputPostFormatter.js b/libjsqrc/ethereumjs/test/formatters.outputPostFormatter.js
new file mode 100644
index 000000000..850d3d801
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/formatters.outputPostFormatter.js
@@ -0,0 +1,26 @@
+var assert = require('assert');
+var formatters = require('../lib/web3/formatters.js');
+
+describe('formatters', function () {
+    describe('outputPostFormatter', function () {
+        it('should return the correct value', function () {
+            
+            assert.deepEqual(formatters.outputPostFormatter({
+                expiry: '0x3e8',
+                sent: '0x3e8',
+                ttl: '0x3e8',
+                workProved: '0x3e8',
+                payload: '0x7b2274657374223a2274657374227d',
+                topics: ['0x68656c6c6f','0x6d79746f70696373']                
+            }), {
+                expiry: 1000,
+                sent: 1000,
+                ttl: 1000,
+                workProved: 1000,
+                payload: {test: 'test'},
+                payloadRaw: '0x7b2274657374223a2274657374227d',
+                topics: ['hello','mytopics']
+            });
+        });
+    });
+});
diff --git a/libjsqrc/ethereumjs/test/formatters.outputTransactionFormatter.js b/libjsqrc/ethereumjs/test/formatters.outputTransactionFormatter.js
new file mode 100644
index 000000000..f42ed8495
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/formatters.outputTransactionFormatter.js
@@ -0,0 +1,26 @@
+var assert = require('assert');
+var formatters = require('../lib/web3/formatters.js');
+var BigNumber = require('bignumber.js');
+
+describe('formatters', function () {
+    describe('outputTransactionFormatter', function () {
+        it('should return the correct value', function () {
+            
+            assert.deepEqual(formatters.outputTransactionFormatter({
+                input: '0x34234kjh23kj4234',
+                from: '0x00000',
+                to: '0x00000',
+                value: '0x3e8',
+                gas: '0x3e8',
+                gasPrice: '0x3e8'
+            }), {
+                input: '0x34234kjh23kj4234',
+                from: '0x00000',
+                to: '0x00000',
+                value: new BigNumber(1000),
+                gas: 1000,
+                gasPrice: new BigNumber(1000),
+            });
+        });
+    });
+});
diff --git a/libjsqrc/ethereumjs/test/jsonrpc.isValidResponse.js b/libjsqrc/ethereumjs/test/jsonrpc.isValidResponse.js
index 920b5f3a9..78388a443 100644
--- a/libjsqrc/ethereumjs/test/jsonrpc.isValidResponse.js
+++ b/libjsqrc/ethereumjs/test/jsonrpc.isValidResponse.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var jsonrpc = require('../lib/jsonrpc');
+var jsonrpc = require('../lib/web3/jsonrpc');
 
 describe('jsonrpc', function () {
     describe('isValidResponse', function () {
diff --git a/libjsqrc/ethereumjs/test/jsonrpc.toBatchPayload.js b/libjsqrc/ethereumjs/test/jsonrpc.toBatchPayload.js
index 1c1aafebb..c9a1e51e0 100644
--- a/libjsqrc/ethereumjs/test/jsonrpc.toBatchPayload.js
+++ b/libjsqrc/ethereumjs/test/jsonrpc.toBatchPayload.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var jsonrpc = require('../lib/jsonrpc');
+var jsonrpc = require('../lib/web3/jsonrpc');
 
 describe('jsonrpc', function () {
     describe('toBatchPayload', function () {
diff --git a/libjsqrc/ethereumjs/test/jsonrpc.toPayload.js b/libjsqrc/ethereumjs/test/jsonrpc.toPayload.js
index 6d6f003bb..a79501d73 100644
--- a/libjsqrc/ethereumjs/test/jsonrpc.toPayload.js
+++ b/libjsqrc/ethereumjs/test/jsonrpc.toPayload.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var jsonrpc = require('../lib/jsonrpc');
+var jsonrpc = require('../lib/web3/jsonrpc');
 
 describe('jsonrpc', function () {
     describe('toPayload', function () {
diff --git a/libjsqrc/ethereumjs/test/net.methods.js b/libjsqrc/ethereumjs/test/net.methods.js
new file mode 100644
index 000000000..26d9c224d
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/net.methods.js
@@ -0,0 +1,10 @@
+var assert = require('assert');
+var web3 = require('../index.js');
+var u = require('./test.utils.js');
+
+describe('web3', function() {
+    describe('net', function() {
+        u.propertyExists(web3.net, 'listening');
+        u.propertyExists(web3.net, 'peerCount');
+    });
+});
\ No newline at end of file
diff --git a/libjsqrc/ethereumjs/test/shh.methods.js b/libjsqrc/ethereumjs/test/shh.methods.js
index 91ca3caba..f8501d527 100644
--- a/libjsqrc/ethereumjs/test/shh.methods.js
+++ b/libjsqrc/ethereumjs/test/shh.methods.js
@@ -6,9 +6,10 @@ describe('web3', function() {
     describe('shh', function() {
         u.methodExists(web3.shh, 'post');
         u.methodExists(web3.shh, 'newIdentity');
-        u.methodExists(web3.shh, 'haveIdentity');
+        u.methodExists(web3.shh, 'hasIdentity');
         u.methodExists(web3.shh, 'newGroup');
         u.methodExists(web3.shh, 'addToGroup');
+        u.methodExists(web3.shh, 'filter');
     });
 });
 
diff --git a/libjsqrc/ethereumjs/test/utils.extractDisplayName.js b/libjsqrc/ethereumjs/test/utils.extractDisplayName.js
index 148653ab2..c401b7e60 100644
--- a/libjsqrc/ethereumjs/test/utils.extractDisplayName.js
+++ b/libjsqrc/ethereumjs/test/utils.extractDisplayName.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var utils = require('../lib/utils.js');
+var utils = require('../lib/utils/utils.js');
 
 describe('utils', function () {
     describe('extractDisplayName', function () {
diff --git a/libjsqrc/ethereumjs/test/utils.extractTypeName.js b/libjsqrc/ethereumjs/test/utils.extractTypeName.js
index 2b4bbe767..7211ff613 100644
--- a/libjsqrc/ethereumjs/test/utils.extractTypeName.js
+++ b/libjsqrc/ethereumjs/test/utils.extractTypeName.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var utils = require('../lib/utils.js');
+var utils = require('../lib/utils/utils.js');
 
 describe('utils', function () {
     describe('extractTypeName', function () {
diff --git a/libjsqrc/ethereumjs/test/utils.filters.js b/libjsqrc/ethereumjs/test/utils.filters.js
index f2d2788b0..4629e4fe8 100644
--- a/libjsqrc/ethereumjs/test/utils.filters.js
+++ b/libjsqrc/ethereumjs/test/utils.filters.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var utils = require('../lib/utils.js');
+var utils = require('../lib/utils/utils.js');
 
 describe('utils', function() {
     it('should filter functions and events from input array properly', function () {
diff --git a/libjsqrc/ethereumjs/test/utils.fromDecimal.js b/libjsqrc/ethereumjs/test/utils.fromDecimal.js
new file mode 100644
index 000000000..4dc774c74
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/utils.fromDecimal.js
@@ -0,0 +1,43 @@
+var chai = require('chai');
+var utils = require('../lib/utils/utils.js');
+var assert = chai.assert;
+
+var tests = [
+    { value: 1, expected: '0x1' },
+    { value: '1', expected: '0x1' },
+    { value: '0x1', expected: '0x1'},
+    { value: '0x01', expected: '0x1'},
+    { value: 15, expected: '0xf'},
+    { value: '15', expected: '0xf'},
+    { value: '0xf', expected: '0xf'},
+    { value: '0x0f', expected: '0xf'},
+    { value: -1, expected: '-0x1'},
+    { value: '-1', expected: '-0x1'},
+    { value: '-0x1', expected: '-0x1'},
+    { value: '-0x01', expected: '-0x1'},
+    { value: -15, expected: '-0xf'},
+    { value: '-15', expected: '-0xf'},
+    { value: '-0xf', expected: '-0xf'},
+    { value: '-0x0f', expected: '-0xf'},
+    { value: '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', expected: '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'},
+    { value: '0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd', expected: '0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd'},
+    { value: '-0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', expected: '-0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'},
+    { value: '-0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd', expected: '-0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd'},
+    { value: 0, expected: '0x0'},
+    { value: '0', expected: '0x0'},
+    { value: '0x0', expected: '0x0'},
+    { value: -0, expected: '0x0'},
+    { value: '-0', expected: '0x0'},
+    { value: '-0x0', expected: '0x0'}
+];
+
+describe('utils', function () {
+    describe('fromDecimal', function () {
+        tests.forEach(function (test) {
+            it('should turn ' + test.value + ' to ' + test.expected, function () {
+                assert.equal(utils.fromDecimal(test.value), test.expected);
+            });
+        });
+    });
+});
+
diff --git a/libjsqrc/ethereumjs/test/utils.fromWei.js b/libjsqrc/ethereumjs/test/utils.fromWei.js
new file mode 100644
index 000000000..735575c68
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/utils.fromWei.js
@@ -0,0 +1,22 @@
+var assert = require('assert');
+var utils = require('../lib/utils/utils.js');
+
+describe('utils', function () {
+    describe('fromWei', function () {
+        it('should return the correct value', function () {
+            
+            assert.equal(utils.fromWei(1000000000000000000, 'wei'),    '1000000000000000000');
+            assert.equal(utils.fromWei(1000000000000000000, 'kwei'),   '1000000000000000');
+            assert.equal(utils.fromWei(1000000000000000000, 'mwei'),   '1000000000000');
+            assert.equal(utils.fromWei(1000000000000000000, 'gwei'),   '1000000000');
+            assert.equal(utils.fromWei(1000000000000000000, 'szabo'),  '1000000');
+            assert.equal(utils.fromWei(1000000000000000000, 'finney'), '1000');
+            assert.equal(utils.fromWei(1000000000000000000, 'ether'),  '1');
+            assert.equal(utils.fromWei(1000000000000000000, 'kether'), '0.001');
+            assert.equal(utils.fromWei(1000000000000000000, 'grand'),  '0.001');
+            assert.equal(utils.fromWei(1000000000000000000, 'mether'), '0.000001');
+            assert.equal(utils.fromWei(1000000000000000000, 'gether'), '0.000000001');
+            assert.equal(utils.fromWei(1000000000000000000, 'tether'), '0.000000000001');
+        });
+    });
+});
diff --git a/libjsqrc/ethereumjs/test/utils.isAddress.js b/libjsqrc/ethereumjs/test/utils.isAddress.js
new file mode 100644
index 000000000..d2d087ffd
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/utils.isAddress.js
@@ -0,0 +1,23 @@
+var chai = require('chai');
+var utils = require('../lib/utils/utils.js');
+var assert = chai.assert;
+
+var tests = [
+    { value: function () {}, is: false},
+    { value: new Function(), is: false},
+    { value: 'function', is: false},
+    { value: {}, is: false},
+    { value: '0xc6d9d2cd449a754c494264e1809c50e34d64562b', is: true },
+    { value: 'c6d9d2cd449a754c494264e1809c50e34d64562b', is: true }
+];
+
+describe('utils', function () {
+    describe('isAddress', function () {
+        tests.forEach(function (test) {
+            it('shoud test if value ' + test.value + ' is address: ' + test.is, function () {
+                assert.equal(utils.isAddress(test.value), test.is);
+            });
+        });   
+    });
+});
+
diff --git a/libjsqrc/ethereumjs/test/utils.isBigNumber.js b/libjsqrc/ethereumjs/test/utils.isBigNumber.js
new file mode 100644
index 000000000..a3de36916
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/utils.isBigNumber.js
@@ -0,0 +1,26 @@
+var chai = require('chai');
+var utils = require('../lib/utils/utils.js');
+var BigNumber = require('bignumber.js');
+var assert = chai.assert;
+
+var tests = [
+    { value: function () {}, is: false},
+    { value: new Function(), is: false},
+    { value: 'function', is: false},
+    { value: {}, is: false},
+    { value: new String('hello'), is: false},
+    { value: new BigNumber(0), is: true},
+    { value: 132, is: false},
+    { value: '0x12', is: false},
+
+];
+
+describe('utils', function () {
+    describe('isBigNumber', function () {
+        tests.forEach(function (test) {
+            it('shoud test if value ' + test.func + ' is BigNumber: ' + test.is, function () {
+                assert.equal(utils.isBigNumber(test.value), test.is);
+            });
+        });   
+    });
+});
diff --git a/libjsqrc/ethereumjs/test/utils.isFunction.js b/libjsqrc/ethereumjs/test/utils.isFunction.js
new file mode 100644
index 000000000..c113bc334
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/utils.isFunction.js
@@ -0,0 +1,21 @@
+var chai = require('chai');
+var utils = require('../lib/utils/utils.js');
+var assert = chai.assert;
+
+var tests = [
+    { func: function () {}, is: true},
+    { func: new Function(), is: true},
+    { func: 'function', is: false},
+    { func: {}, is: false}
+];
+
+describe('utils', function () {
+    describe('isFunction', function () {
+        tests.forEach(function (test) {
+            it('shoud test if value ' + test.func + ' is function: ' + test.is, function () {
+                assert.equal(utils.isFunction(test.func), test.is);
+            });
+        });   
+    });
+});
+
diff --git a/libjsqrc/ethereumjs/test/utils.isString.js b/libjsqrc/ethereumjs/test/utils.isString.js
new file mode 100644
index 000000000..bb36ccd67
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/utils.isString.js
@@ -0,0 +1,22 @@
+var chai = require('chai');
+var utils = require('../lib/utils/utils.js');
+var assert = chai.assert;
+
+var tests = [
+    { value: function () {}, is: false},
+    { value: new Function(), is: false},
+    { value: 'function', is: true},
+    { value: {}, is: false},
+    { value: new String('hello'), is: true}
+];
+
+describe('utils', function () {
+    describe('isString', function () {
+        tests.forEach(function (test) {
+            it('shoud test if value ' + test.func + ' is string: ' + test.is, function () {
+                assert.equal(utils.isString(test.value), test.is);
+            });
+        });   
+    });
+});
+
diff --git a/libjsqrc/ethereumjs/test/utils.toBigNumber.js b/libjsqrc/ethereumjs/test/utils.toBigNumber.js
new file mode 100644
index 000000000..2d293c12a
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/utils.toBigNumber.js
@@ -0,0 +1,45 @@
+var chai = require('chai');
+var utils = require('../lib/utils/utils.js');
+var BigNumber = require('bignumber.js');
+var assert = chai.assert;
+
+var tests = [
+    { value: 1, expected: '1' },
+    { value: '1', expected: '1' },
+    { value: '0x1', expected: '1'},
+    { value: '0x01', expected: '1'},
+    { value: 15, expected: '15'},
+    { value: '15', expected: '15'},
+    { value: '0xf', expected: '15'},
+    { value: '0x0f', expected: '15'},
+    { value: new BigNumber('f', 16), expected: '15'},
+    { value: -1, expected: '-1'},
+    { value: '-1', expected: '-1'},
+    { value: '-0x1', expected: '-1'},
+    { value: '-0x01', expected: '-1'},
+    { value: -15, expected: '-15'},
+    { value: '-15', expected: '-15'},
+    { value: '-0xf', expected: '-15'},
+    { value: '-0x0f', expected: '-15'},
+    { value: '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', expected: '115792089237316195423570985008687907853269984665640564039457584007913129639935'},
+    { value: '0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd', expected: '115792089237316195423570985008687907853269984665640564039457584007913129639933'},
+    { value: '-0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', expected: '-115792089237316195423570985008687907853269984665640564039457584007913129639935'},
+    { value: '-0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd', expected: '-115792089237316195423570985008687907853269984665640564039457584007913129639933'},
+    { value: 0, expected: '0'},
+    { value: '0', expected: '0'},
+    { value: '0x0', expected: '0'},
+    { value: -0, expected: '0'},
+    { value: '-0', expected: '0'},
+    { value: '-0x0', expected: '0'},
+    { value: new BigNumber(0), expected: '0'}
+];
+
+describe('utils', function () {
+    describe('toBigNumber', function () {
+        tests.forEach(function (test) {
+            it('should turn ' + test.value + ' to ' + test.expected, function () {
+                assert.equal(utils.toBigNumber(test.value).toString(10), test.expected);
+            });
+        });
+    });
+});
diff --git a/libjsqrc/ethereumjs/test/utils.toDecimal.js b/libjsqrc/ethereumjs/test/utils.toDecimal.js
new file mode 100644
index 000000000..d785b0444
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/utils.toDecimal.js
@@ -0,0 +1,14 @@
+var assert = require('assert');
+var utils = require('../lib/utils/utils.js');
+
+describe('utils', function () {
+    describe('toDecimal', function () {
+        it('should return the correct value', function () {
+            
+            assert.equal(utils.toDecimal("0x3e8"), '1000');
+            // allow compatiblity
+            assert.equal(utils.toDecimal(100000), '100000');
+            assert.equal(utils.toDecimal('100000'), '100000');
+        });
+    });
+});
diff --git a/libjsqrc/ethereumjs/test/utils.toHex.js b/libjsqrc/ethereumjs/test/utils.toHex.js
new file mode 100644
index 000000000..2e9c59cb5
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/utils.toHex.js
@@ -0,0 +1,42 @@
+var chai = require('chai');
+var utils = require('../lib/utils/utils');
+var BigNumber = require('bignumber.js');
+var assert = chai.assert;
+
+var tests = [
+    { value: 1, expected: '0x1' },
+    { value: '1', expected: '0x1' },
+    { value: '0x1', expected: '0x1'},
+    { value: '15', expected: '0xf'},
+    { value: '0xf', expected: '0xf'},
+    { value: -1, expected: '-0x1'},
+    { value: '-1', expected: '-0x1'},
+    { value: '-0x1', expected: '-0x1'},
+    { value: '-15', expected: '-0xf'},
+    { value: '-0xf', expected: '-0xf'},
+    { value: '0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd', expected: '0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd'},
+    { value: '-0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', expected: '-0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'},
+    { value: '-0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd', expected: '-0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd'},
+    { value: 0, expected: '0x0'},
+    { value: '0', expected: '0x0'},
+    { value: '0x0', expected: '0x0'},
+    { value: -0, expected: '0x0'},
+    { value: '-0', expected: '0x0'},
+    { value: '-0x0', expected: '0x0'},
+    { value: [1,2,3,{test: 'data'}], expected: '0x5b312c322c332c7b2274657374223a2264617461227d5d'},
+    { value: {test: 'test'}, expected: '0x7b2274657374223a2274657374227d'},
+    { value: '{"test": "test"}', expected: '0x7b2274657374223a202274657374227d'},
+    { value: 'myString', expected: '0x6d79537472696e67'},
+    { value: new BigNumber(15), expected: '0xf'}
+];
+
+describe('utils', function () {
+    describe('toHex', function () {
+        tests.forEach(function (test) {
+            it('should turn ' + test.value + ' to ' + test.expected, function () {
+                assert.equal(utils.toHex(test.value), test.expected);
+            });
+        });
+    });
+});
+
diff --git a/libjsqrc/ethereumjs/test/utils.toWei.js b/libjsqrc/ethereumjs/test/utils.toWei.js
new file mode 100644
index 000000000..33e03ffc3
--- /dev/null
+++ b/libjsqrc/ethereumjs/test/utils.toWei.js
@@ -0,0 +1,25 @@
+var chai = require('chai');
+var utils = require('../lib/utils/utils');
+var assert = chai.assert;
+
+describe('utils', function () {
+    describe('toWei', function () {
+        it('should return the correct value', function () {
+            
+            assert.equal(utils.toWei(1, 'wei'),    '1');
+            assert.equal(utils.toWei(1, 'kwei'),   '1000');
+            assert.equal(utils.toWei(1, 'mwei'),   '1000000');
+            assert.equal(utils.toWei(1, 'gwei'),   '1000000000');
+            assert.equal(utils.toWei(1, 'szabo'),  '1000000000000');
+            assert.equal(utils.toWei(1, 'finney'), '1000000000000000');
+            assert.equal(utils.toWei(1, 'ether'),  '1000000000000000000');
+            assert.equal(utils.toWei(1, 'kether'), '1000000000000000000000');
+            assert.equal(utils.toWei(1, 'grand'),  '1000000000000000000000');
+            assert.equal(utils.toWei(1, 'mether'), '1000000000000000000000000');
+            assert.equal(utils.toWei(1, 'gether'), '1000000000000000000000000000');
+            assert.equal(utils.toWei(1, 'tether'), '1000000000000000000000000000000');
+
+            assert.throws(function () {utils.toWei(1, 'wei1');}, Error);
+        });
+    });
+});
diff --git a/libjsqrc/ethereumjs/test/web3.methods.js b/libjsqrc/ethereumjs/test/web3.methods.js
index 8dcc61101..92d4e1604 100644
--- a/libjsqrc/ethereumjs/test/web3.methods.js
+++ b/libjsqrc/ethereumjs/test/web3.methods.js
@@ -8,7 +8,10 @@ describe('web3', function() {
     u.methodExists(web3, 'fromAscii');
     u.methodExists(web3, 'toDecimal');
     u.methodExists(web3, 'fromDecimal');
-    u.methodExists(web3, 'toEth');
+    u.methodExists(web3, 'fromWei');
+    u.methodExists(web3, 'toWei');
+    u.methodExists(web3, 'toBigNumber');
+    u.methodExists(web3, 'isAddress');
     u.methodExists(web3, 'setProvider');
     u.methodExists(web3, 'reset');
 
diff --git a/libjsqrc/ethereumjs/version.json b/libjsqrc/ethereumjs/version.json
new file mode 100644
index 000000000..39bf64da0
--- /dev/null
+++ b/libjsqrc/ethereumjs/version.json
@@ -0,0 +1,3 @@
+{
+    "version": "0.1.3"
+}
\ No newline at end of file
diff --git a/libjsqrc/setup.js b/libjsqrc/setup.js
index fa1921877..59607fbde 100644
--- a/libjsqrc/setup.js
+++ b/libjsqrc/setup.js
@@ -21,5 +21,5 @@
  */
 
 var web3 = require('web3');
-web3.setProvider(new web3.providers.HttpSyncProvider());
+web3.setProvider(new web3.providers.HttpProvider());
 
diff --git a/libp2p/Host.cpp b/libp2p/Host.cpp
index 8f4f8a69d..19df5ee2e 100644
--- a/libp2p/Host.cpp
+++ b/libp2p/Host.cpp
@@ -550,14 +550,22 @@ void Host::run(boost::system::error_code const&)
 	// is always live and to ensure reputation and fallback timers are properly
 	// updated. // disconnectLatePeers();
 
-	if (peerCount() < m_idealPeerCount)
+	auto openSlots = m_idealPeerCount - peerCount();
+	if (openSlots > 0)
 	{
-		for (auto p: m_peers)
-			if (p.second->shouldReconnect())
-			{
-				connect(p.second);
+		list<shared_ptr<Peer>> toConnect;
+		{
+			RecursiveGuard l(x_sessions);
+			for (auto p: m_peers)
+				if (p.second->shouldReconnect())
+					toConnect.push_back(p.second);
+		}
+		
+		for (auto p: toConnect)
+			if (openSlots--)
+				connect(p);
+			else
 				break;
-			}
 		
 		m_nodeTable->discover();
 	}
diff --git a/libp2p/NodeTable.cpp b/libp2p/NodeTable.cpp
index adeb43c2e..08bb0624a 100644
--- a/libp2p/NodeTable.cpp
+++ b/libp2p/NodeTable.cpp
@@ -97,7 +97,7 @@ shared_ptr<NodeEntry> NodeTable::addNode(Node const& _node)
 	m_socketPointer->send(p);
 	
 	// TODO p2p: rename to p2p.nodes.pending, add p2p.nodes.add event (when pong is received)
-	clog(NodeTableNote) << "p2p.nodes.add " << _node.id.abridged();
+	clog(NodeTableUpdate) << "p2p.nodes.add " << _node.id.abridged();
 	if (m_nodeEventHandler)
 		m_nodeEventHandler->appendEvent(_node.id, NodeEntryAdded);
 	
@@ -159,7 +159,7 @@ void NodeTable::discover(NodeId _node, unsigned _round, shared_ptr<set<shared_pt
 	
 	if (_round == s_maxSteps)
 	{
-		clog(NodeTableNote) << "Terminating discover after " << _round << " rounds.";
+		clog(NodeTableEvent) << "Terminating discover after " << _round << " rounds.";
 		return;
 	}
 	else if(!_round && !_tried)
@@ -180,7 +180,7 @@ void NodeTable::discover(NodeId _node, unsigned _round, shared_ptr<set<shared_pt
 	
 	if (tried.empty())
 	{
-		clog(NodeTableNote) << "Terminating discover after " << _round << " rounds.";
+		clog(NodeTableEvent) << "Terminating discover after " << _round << " rounds.";
 		return;
 	}
 		
@@ -308,7 +308,7 @@ void NodeTable::noteActiveNode(Public const& _pubk, bi::udp::endpoint const& _en
 	if (_pubk == m_node.address())
 		return;
 	
-	clog(NodeTableNote) << "Noting active node:" << _pubk.abridged() << _endpoint.address().to_string() << ":" << _endpoint.port();
+	clog(NodeTableConnect) << "Noting active node:" << _pubk.abridged() << _endpoint.address().to_string() << ":" << _endpoint.port();
 
 	shared_ptr<NodeEntry> node(addNode(_pubk, _endpoint, bi::tcp::endpoint(_endpoint.address(), _endpoint.port())));
 
@@ -361,7 +361,7 @@ void NodeTable::dropNode(shared_ptr<NodeEntry> _n)
 		m_nodes.erase(_n->id);
 	}
 	
-	clog(NodeTableNote) << "p2p.nodes.drop " << _n->id.abridged();
+	clog(NodeTableUpdate) << "p2p.nodes.drop " << _n->id.abridged();
 	if (m_nodeEventHandler)
 		m_nodeEventHandler->appendEvent(_n->id, NodeEntryRemoved);
 }
@@ -376,7 +376,7 @@ void NodeTable::onReceived(UDPSocketFace*, bi::udp::endpoint const& _from, bytes
 	// h256 + Signature + type + RLP (smallest possible packet is empty neighbours packet which is 3 bytes)
 	if (_packet.size() < h256::size + Signature::size + 1 + 3)
 	{
-		clog(NodeTableMessageSummary) << "Invalid Message size from " << _from.address().to_string() << ":" << _from.port();
+		clog(NodeTableWarn) << "Invalid Message size from " << _from.address().to_string() << ":" << _from.port();
 		return;
 	}
 	
@@ -384,7 +384,7 @@ void NodeTable::onReceived(UDPSocketFace*, bi::udp::endpoint const& _from, bytes
 	h256 hashSigned(sha3(hashedBytes));
 	if (!_packet.cropped(0, h256::size).contentsEqual(hashSigned.asBytes()))
 	{
-		clog(NodeTableMessageSummary) << "Invalid Message hash from " << _from.address().to_string() << ":" << _from.port();
+		clog(NodeTableWarn) << "Invalid Message hash from " << _from.address().to_string() << ":" << _from.port();
 		return;
 	}
 	
@@ -396,7 +396,7 @@ void NodeTable::onReceived(UDPSocketFace*, bi::udp::endpoint const& _from, bytes
 	Public nodeid(dev::recover(*(Signature const*)sigBytes.data(), sha3(signedBytes)));
 	if (!nodeid)
 	{
-		clog(NodeTableMessageSummary) << "Invalid Message signature from " << _from.address().to_string() << ":" << _from.port();
+		clog(NodeTableWarn) << "Invalid Message signature from " << _from.address().to_string() << ":" << _from.port();
 		return;
 	}
 	
@@ -516,7 +516,7 @@ void NodeTable::doRefreshBuckets(boost::system::error_code const& _ec)
 	if (_ec)
 		return;
 
-	clog(NodeTableNote) << "refreshing buckets";
+	clog(NodeTableEvent) << "refreshing buckets";
 	bool connected = m_socketPointer->isOpen();
 	bool refreshed = false;
 	if (connected)
diff --git a/libp2p/NodeTable.h b/libp2p/NodeTable.h
index 10fa921e4..9717b77a3 100644
--- a/libp2p/NodeTable.h
+++ b/libp2p/NodeTable.h
@@ -411,8 +411,11 @@ struct Neighbours: RLPXDatagram<Neighbours>
 struct NodeTableWarn: public LogChannel { static const char* name() { return "!P!"; } static const int verbosity = 0; };
 struct NodeTableNote: public LogChannel { static const char* name() { return "*P*"; } static const int verbosity = 1; };
 struct NodeTableMessageSummary: public LogChannel { static const char* name() { return "-P-"; } static const int verbosity = 2; };
-struct NodeTableConnect: public LogChannel { static const char* name() { return "+P+"; } static const int verbosity = 10; };
 struct NodeTableMessageDetail: public LogChannel { static const char* name() { return "=P="; } static const int verbosity = 5; };
+struct NodeTableConnect: public LogChannel { static const char* name() { return "+P+"; } static const int verbosity = 10; };
+struct NodeTableEvent: public LogChannel { static const char* name() { return "+P+"; } static const int verbosity = 10; };
+struct NodeTableTimer: public LogChannel { static const char* name() { return "+P+"; } static const int verbosity = 10; };
+struct NodeTableUpdate: public LogChannel { static const char* name() { return "+P+"; } static const int verbosity = 10; };
 struct NodeTableTriviaSummary: public LogChannel { static const char* name() { return "-P-"; } static const int verbosity = 10; };
 struct NodeTableTriviaDetail: public LogChannel { static const char* name() { return "=P="; } static const int verbosity = 11; };
 struct NodeTableAllDetail: public LogChannel { static const char* name() { return "=P="; } static const int verbosity = 13; };
diff --git a/libp2p/RLPxHandshake.cpp b/libp2p/RLPxHandshake.cpp
index 4f5c70802..b6df5f8e0 100644
--- a/libp2p/RLPxHandshake.cpp
+++ b/libp2p/RLPxHandshake.cpp
@@ -98,7 +98,7 @@ void RLPXHandshake::readAuth()
 		}
 		else
 		{
-			clog(NetWarn) << "p2p.connect.egress recving auth decrypt failed for" << m_socket->remoteEndpoint();
+			clog(NetConnect) << "p2p.connect.ingress recving auth decrypt failed for" << m_socket->remoteEndpoint();
 			m_nextState = Error;
 			transition();
 		}
@@ -122,7 +122,7 @@ void RLPXHandshake::readAck()
 		}
 		else
 		{
-			clog(NetWarn) << "p2p.connect.egress recving ack decrypt failed for " << m_socket->remoteEndpoint();
+			clog(NetConnect) << "p2p.connect.egress recving ack decrypt failed for " << m_socket->remoteEndpoint();
 			m_nextState = Error;
 			transition();
 		}
@@ -162,11 +162,7 @@ void RLPXHandshake::transition(boost::system::error_code _ech)
 	else if (m_nextState == WriteHello)
 	{
 		m_nextState = ReadHello;
-		
-		if (m_originated)
-			clog(NetConnect) << "p2p.connect.egress sending capabilities handshake";
-		else
-			clog(NetConnect) << "p2p.connect.ingress sending capabilities handshake";
+		clog(NetConnect) << (m_originated ? "p2p.connect.egress" : "p2p.connect.ingress") << "sending capabilities handshake";
 
 		/// This pointer will be freed if there is an error otherwise
 		/// it will be passed to Host which will take ownership.
diff --git a/libsolidity/AST.cpp b/libsolidity/AST.cpp
index 79b755e97..46c44995b 100644
--- a/libsolidity/AST.cpp
+++ b/libsolidity/AST.cpp
@@ -671,7 +671,7 @@ void IndexAccess::checkTypeRequirements()
 			BOOST_THROW_EXCEPTION(createTypeError("Index expression cannot be omitted."));
 		m_index->expectType(IntegerType(256));
 		if (type.isByteArray())
-			m_type = make_shared<IntegerType>(8, IntegerType::Modifier::Hash);
+			m_type = make_shared<FixedBytesType>(1);
 		else
 			m_type = type.getBaseType();
 		m_isLValue = type.getLocation() != ArrayType::Location::CallData;
diff --git a/libsolidity/ArrayUtils.cpp b/libsolidity/ArrayUtils.cpp
index f0d7d6a81..a064b2f57 100644
--- a/libsolidity/ArrayUtils.cpp
+++ b/libsolidity/ArrayUtils.cpp
@@ -125,6 +125,7 @@ void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType cons
 			CompilerUtils(m_context).loadFromMemoryDynamic(*sourceBaseType, true, true, false);
 		else
 			solAssert(false, "Copying of unknown type requested: " + sourceBaseType->toString());
+		solAssert(2 + sourceBaseType->getSizeOnStack() <= 16, "Stack too deep.");
 		m_context << eth::dupInstruction(2 + sourceBaseType->getSizeOnStack());
 		StorageItem(m_context, *targetBaseType).storeValue(*sourceBaseType, SourceLocation(), true);
 	}
diff --git a/libsolidity/Compiler.cpp b/libsolidity/Compiler.cpp
index dc6e2c5a8..b8ca03d3e 100644
--- a/libsolidity/Compiler.cpp
+++ b/libsolidity/Compiler.cpp
@@ -228,6 +228,7 @@ void Compiler::appendCalldataUnpacker(TypePointers const& _typeParameters, bool
 				{
 					// Retrieve data start offset by adding length to start offset of previous dynamic type
 					unsigned stackDepth = m_context.getStackHeight() - stackHeightOfPreviousDynamicArgument;
+					solAssert(stackDepth <= 16, "Stack too deep.");
 					m_context << eth::dupInstruction(stackDepth) << eth::dupInstruction(stackDepth);
 					ArrayUtils(m_context).convertLengthToSize(*previousDynamicType, true);
 					m_context << eth::Instruction::ADD;
@@ -359,6 +360,7 @@ bool Compiler::visit(FunctionDefinition const& _function)
 		stackLayout.push_back(i);
 	stackLayout += vector<int>(c_localVariablesSize, -1);
 
+	solAssert(stackLayout.size() <= 17, "Stack too deep.");
 	while (stackLayout.back() != int(stackLayout.size() - 1))
 		if (stackLayout.back() < 0)
 		{
diff --git a/libsolidity/CompilerStack.cpp b/libsolidity/CompilerStack.cpp
index a878bb61a..55ec0cb59 100644
--- a/libsolidity/CompilerStack.cpp
+++ b/libsolidity/CompilerStack.cpp
@@ -41,14 +41,14 @@ namespace solidity
 {
 
 const map<string, string> StandardSources = map<string, string>{
-	{"coin", R"(import "CoinReg";import "Config";import "configUser";contract coin is configUser{function coin(string3 name, uint denom) {CoinReg(Config(configAddr()).lookup(3)).register(name, denom);}})"},
+	{"coin", R"(import "CoinReg";import "Config";import "configUser";contract coin is configUser{function coin(bytes3 name, uint denom) {CoinReg(Config(configAddr()).lookup(3)).register(name, denom);}})"},
 	{"Coin", R"(contract Coin{function isApprovedFor(address _target,address _proxy)constant returns(bool _r){}function isApproved(address _proxy)constant returns(bool _r){}function sendCoinFrom(address _from,uint256 _val,address _to){}function coinBalanceOf(address _a)constant returns(uint256 _r){}function sendCoin(uint256 _val,address _to){}function coinBalance()constant returns(uint256 _r){}function approve(address _a){}})"},
-	{"CoinReg", R"(contract CoinReg{function count()constant returns(uint256 r){}function info(uint256 i)constant returns(address addr,string3 name,uint256 denom){}function register(string3 name,uint256 denom){}function unregister(){}})"},
+	{"CoinReg", R"(contract CoinReg{function count()constant returns(uint256 r){}function info(uint256 i)constant returns(address addr,bytes3 name,uint256 denom){}function register(bytes3 name,uint256 denom){}function unregister(){}})"},
 	{"configUser", R"(contract configUser{function configAddr()constant returns(address a){ return 0xc6d9d2cd449a754c494264e1809c50e34d64562b;}})"},
 	{"Config", R"(contract Config{function lookup(uint256 service)constant returns(address a){}function kill(){}function unregister(uint256 id){}function register(uint256 id,address service){}})"},
 	{"mortal", R"(import "owned";contract mortal is owned {function kill() { if (msg.sender == owner) suicide(owner); }})"},
-	{"named", R"(import "Config";import "NameReg";import "configUser";contract named is configUser {function named(string32 name) {NameReg(Config(configAddr()).lookup(1)).register(name);}})"},
-	{"NameReg", R"(contract NameReg{function register(string32 name){}function addressOf(string32 name)constant returns(address addr){}function unregister(){}function nameOf(address addr)constant returns(string32 name){}})"},
+	{"named", R"(import "Config";import "NameReg";import "configUser";contract named is configUser {function named(bytes32 name) {NameReg(Config(configAddr()).lookup(1)).register(name);}})"},
+	{"NameReg", R"(contract NameReg{function register(bytes32 name){}function addressOf(bytes32 name)constant returns(address addr){}function unregister(){}function nameOf(address addr)constant returns(bytes32 name){}})"},
 	{"owned", R"(contract owned{function owned(){owner = msg.sender;}modifier onlyowner(){if(msg.sender==owner)_}address owner;})"},
 	{"service", R"(import "Config";import "configUser";contract service is configUser{function service(uint _n){Config(configAddr()).register(_n, this);}})"},
 	{"std", R"(import "owned";import "mortal";import "Config";import "configUser";import "NameReg";import "named";)"}
diff --git a/libsolidity/CompilerUtils.cpp b/libsolidity/CompilerUtils.cpp
index 8a26b5d17..e517e384d 100644
--- a/libsolidity/CompilerUtils.cpp
+++ b/libsolidity/CompilerUtils.cpp
@@ -138,6 +138,7 @@ void CompilerUtils::moveToStackVariable(VariableDeclaration const& _variable)
 {
 	unsigned const stackPosition = m_context.baseToCurrentStackOffset(m_context.getBaseStackOffsetOfVariable(_variable));
 	unsigned const size = _variable.getType()->getSizeOnStack();
+	solAssert(stackPosition >= size, "Variable size and position mismatch.");
 	// move variable starting from its top end in the stack
 	if (stackPosition - size + 1 > 16)
 		BOOST_THROW_EXCEPTION(CompilerError() << errinfo_sourceLocation(_variable.getLocation())
@@ -148,8 +149,7 @@ void CompilerUtils::moveToStackVariable(VariableDeclaration const& _variable)
 
 void CompilerUtils::copyToStackTop(unsigned _stackDepth, unsigned _itemSize)
 {
-	if (_stackDepth > 16)
-		BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Stack too deep."));
+	solAssert(_stackDepth <= 16, "Stack too deep.");
 	for (unsigned i = 0; i < _itemSize; ++i)
 		m_context << eth::dupInstruction(_stackDepth);
 }
@@ -178,7 +178,7 @@ void CompilerUtils::computeHashStatic(Type const& _type, bool _padToWordBoundari
 unsigned CompilerUtils::loadFromMemoryHelper(Type const& _type, bool _fromCalldata, bool _padToWordBoundaries)
 {
 	unsigned numBytes = _type.getCalldataEncodedSize(_padToWordBoundaries);
-	bool leftAligned = _type.getCategory() == Type::Category::String;
+	bool leftAligned = _type.getCategory() == Type::Category::FixedBytes;
 	if (numBytes == 0)
 		m_context << eth::Instruction::POP << u256(0);
 	else
@@ -202,7 +202,7 @@ unsigned CompilerUtils::loadFromMemoryHelper(Type const& _type, bool _fromCallda
 unsigned CompilerUtils::prepareMemoryStore(Type const& _type, bool _padToWordBoundaries) const
 {
 	unsigned numBytes = _type.getCalldataEncodedSize(_padToWordBoundaries);
-	bool leftAligned = _type.getCategory() == Type::Category::String;
+	bool leftAligned = _type.getCategory() == Type::Category::FixedBytes;
 	if (numBytes == 0)
 		m_context << eth::Instruction::POP;
 	else
diff --git a/libsolidity/ExpressionCompiler.cpp b/libsolidity/ExpressionCompiler.cpp
index 129261120..331979c7d 100644
--- a/libsolidity/ExpressionCompiler.cpp
+++ b/libsolidity/ExpressionCompiler.cpp
@@ -123,23 +123,25 @@ void ExpressionCompiler::appendTypeConversion(Type const& _typeOnStack, Type con
 	Type::Category stackTypeCategory = _typeOnStack.getCategory();
 	Type::Category targetTypeCategory = _targetType.getCategory();
 
-	if (stackTypeCategory == Type::Category::String)
+	switch (stackTypeCategory)
 	{
-		StaticStringType const& typeOnStack = dynamic_cast<StaticStringType const&>(_typeOnStack);
+	case Type::Category::FixedBytes:
+	{
+		FixedBytesType const& typeOnStack = dynamic_cast<FixedBytesType const&>(_typeOnStack);
 		if (targetTypeCategory == Type::Category::Integer)
 		{
-			// conversion from string to hash. no need to clean the high bit
+			// conversion from bytes to integer. no need to clean the high bit
 			// only to shift right because of opposite alignment
 			IntegerType const& targetIntegerType = dynamic_cast<IntegerType const&>(_targetType);
-			solAssert(targetIntegerType.isHash(), "Only conversion between String and Hash is allowed.");
-			solAssert(targetIntegerType.getNumBits() == typeOnStack.getNumBytes() * 8, "The size should be the same.");
 			m_context << (u256(1) << (256 - typeOnStack.getNumBytes() * 8)) << eth::Instruction::SWAP1 << eth::Instruction::DIV;
+			if (targetIntegerType.getNumBits() < typeOnStack.getNumBytes() * 8)
+				appendTypeConversion(IntegerType(typeOnStack.getNumBytes() * 8), _targetType, _cleanupNeeded); 
 		}
 		else
 		{
-			// clear lower-order bytes for conversion to shorter strings - we always clean
-			solAssert(targetTypeCategory == Type::Category::String, "Invalid type conversion requested.");
-			StaticStringType const& targetType = dynamic_cast<StaticStringType const&>(_targetType);
+			// clear lower-order bytes for conversion to shorter bytes - we always clean
+			solAssert(targetTypeCategory == Type::Category::FixedBytes, "Invalid type conversion requested.");
+			FixedBytesType const& targetType = dynamic_cast<FixedBytesType const&>(_targetType);
 			if (targetType.getNumBytes() < typeOnStack.getNumBytes())
 			{
 				if (targetType.getNumBytes() == 0)
@@ -151,22 +153,24 @@ void ExpressionCompiler::appendTypeConversion(Type const& _typeOnStack, Type con
 			}
 		}
 	}
-	else if (stackTypeCategory == Type::Category::Enum)
-		solAssert(targetTypeCategory == Type::Category::Integer ||
-			targetTypeCategory == Type::Category::Enum, "");
-	else if (stackTypeCategory == Type::Category::Integer ||
-		stackTypeCategory == Type::Category::Contract ||
-		stackTypeCategory == Type::Category::IntegerConstant)
-	{
-		if (targetTypeCategory == Type::Category::String && stackTypeCategory == Type::Category::Integer)
+		break;
+	case Type::Category::Enum:
+		solAssert(targetTypeCategory == Type::Category::Integer || targetTypeCategory == Type::Category::Enum, "");
+		break;
+	case Type::Category::Integer:
+	case Type::Category::Contract:
+	case Type::Category::IntegerConstant:
+		if (targetTypeCategory == Type::Category::FixedBytes)
 		{
-			// conversion from hash to string. no need to clean the high bit
+			solAssert(stackTypeCategory == Type::Category::Integer || stackTypeCategory == Type::Category::IntegerConstant,
+				"Invalid conversion to FixedBytesType requested.");
+			// conversion from bytes to string. no need to clean the high bit
 			// only to shift left because of opposite alignment
-			StaticStringType const& targetStringType = dynamic_cast<StaticStringType const&>(_targetType);
-			IntegerType const& typeOnStack = dynamic_cast<IntegerType const&>(_typeOnStack);
-			solAssert(typeOnStack.isHash(), "Only conversion between String and Hash is allowed.");
-			solAssert(typeOnStack.getNumBits() == targetStringType.getNumBytes() * 8, "The size should be the same.");
-			m_context << (u256(1) << (256 - typeOnStack.getNumBits())) << eth::Instruction::MUL;
+			FixedBytesType const& targetBytesType = dynamic_cast<FixedBytesType const&>(_targetType);
+			if (auto typeOnStack = dynamic_cast<IntegerType const*>(&_typeOnStack))
+				if (targetBytesType.getNumBytes() * 8 > typeOnStack->getNumBits())
+					appendHighBitsCleanup(*typeOnStack);
+			m_context << (u256(1) << (256 - targetBytesType.getNumBytes() * 8)) << eth::Instruction::MUL;
 		}
 		else if (targetTypeCategory == Type::Category::Enum)
 			// just clean
@@ -176,7 +180,7 @@ void ExpressionCompiler::appendTypeConversion(Type const& _typeOnStack, Type con
 			solAssert(targetTypeCategory == Type::Category::Integer || targetTypeCategory == Type::Category::Contract, "");
 			IntegerType addressType(0, IntegerType::Modifier::Address);
 			IntegerType const& targetType = targetTypeCategory == Type::Category::Integer
-											? dynamic_cast<IntegerType const&>(_targetType) : addressType;
+				? dynamic_cast<IntegerType const&>(_targetType) : addressType;
 			if (stackTypeCategory == Type::Category::IntegerConstant)
 			{
 				IntegerConstantType const& constType = dynamic_cast<IntegerConstantType const&>(_typeOnStack);
@@ -188,7 +192,7 @@ void ExpressionCompiler::appendTypeConversion(Type const& _typeOnStack, Type con
 			else
 			{
 				IntegerType const& typeOnStack = stackTypeCategory == Type::Category::Integer
-												? dynamic_cast<IntegerType const&>(_typeOnStack) : addressType;
+					? dynamic_cast<IntegerType const&>(_typeOnStack) : addressType;
 				// Widening: clean up according to source type width
 				// Non-widening and force: clean up according to target type bits
 				if (targetType.getNumBits() > typeOnStack.getNumBits())
@@ -197,10 +201,12 @@ void ExpressionCompiler::appendTypeConversion(Type const& _typeOnStack, Type con
 					appendHighBitsCleanup(targetType);
 			}
 		}
-	}
-	else if (_typeOnStack != _targetType)
+		break;
+	default:
 		// All other types should not be convertible to non-equal types.
-		BOOST_THROW_EXCEPTION(InternalCompilerError() << errinfo_comment("Invalid type conversion requested."));
+		solAssert(_typeOnStack == _targetType, "Invalid type conversion requested.");
+		break;
+	}
 }
 
 bool ExpressionCompiler::visit(Assignment const& _assignment)
@@ -227,9 +233,12 @@ bool ExpressionCompiler::visit(Assignment const& _assignment)
 		m_currentLValue->retrieveValue(_assignment.getLocation(), true);
 		appendOrdinaryBinaryOperatorCode(Token::AssignmentToBinaryOp(op), *_assignment.getType());
 		if (lvalueSize > 0)
+		{
+			solAssert(itemSize + lvalueSize <= 16, "Stack too deep.");
 			// value [lvalue_ref] updated_value
 			for (unsigned i = 0; i < itemSize; ++i)
 				m_context << eth::swapInstruction(itemSize + lvalueSize) << eth::Instruction::POP;
+		}
 	}
 	m_currentLValue->storeValue(*_assignment.getRightHandSide().getType(), _assignment.getLocation());
 	m_currentLValue.reset();
@@ -551,10 +560,13 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 		case Location::SHA256:
 		case Location::RIPEMD160:
 		{
+			_functionCall.getExpression().accept(*this);
 			static const map<Location, u256> contractAddresses{{Location::ECRecover, 1},
 															   {Location::SHA256, 2},
 															   {Location::RIPEMD160, 3}};
 			m_context << contractAddresses.find(function.getLocation())->second;
+			for (unsigned i = function.getSizeOnStack(); i > 0; --i)
+				m_context << eth::swapInstruction(i);
 			appendExternalFunctionCall(function, arguments, true);
 			break;
 		}
@@ -775,7 +787,7 @@ bool ExpressionCompiler::visit(IndexAccess const& _indexAccess)
 				// no lvalue, just retrieve the value
 				m_context
 					<< eth::Instruction::ADD << eth::Instruction::CALLDATALOAD
-					<< u256(0) << eth::Instruction::BYTE;
+					<< ((u256(0xff) << (256 - 8)))  << eth::Instruction::AND;
 				break;
 			case ArrayType::Location::Memory:
 				solAssert(false, "Memory lvalues not yet implemented.");
@@ -870,7 +882,7 @@ void ExpressionCompiler::endVisit(Literal const& _literal)
 	{
 	case Type::Category::IntegerConstant:
 	case Type::Category::Bool:
-	case Type::Category::String:
+	case Type::Category::FixedBytes:
 		m_context << _literal.getType()->literalValue(&_literal);
 		break;
 	default:
diff --git a/libsolidity/GlobalContext.cpp b/libsolidity/GlobalContext.cpp
index 411e99abb..80cebd760 100644
--- a/libsolidity/GlobalContext.cpp
+++ b/libsolidity/GlobalContext.cpp
@@ -41,23 +41,23 @@ m_magicVariables(vector<shared_ptr<MagicVariableDeclaration const>>{make_shared<
 					make_shared<MagicVariableDeclaration>("suicide",
 							make_shared<FunctionType>(strings{"address"}, strings{}, FunctionType::Location::Suicide)),
 					make_shared<MagicVariableDeclaration>("sha3",
-							make_shared<FunctionType>(strings(), strings{"hash"}, FunctionType::Location::SHA3, true)),
+							make_shared<FunctionType>(strings(), strings{"bytes32"}, FunctionType::Location::SHA3, true)),
 					make_shared<MagicVariableDeclaration>("log0",
-							make_shared<FunctionType>(strings{"hash"},strings{}, FunctionType::Location::Log0)),
+							make_shared<FunctionType>(strings{"bytes32"}, strings{}, FunctionType::Location::Log0)),
 					make_shared<MagicVariableDeclaration>("log1",
-							make_shared<FunctionType>(strings{"hash", "hash"},strings{}, FunctionType::Location::Log1)),
+							make_shared<FunctionType>(strings{"bytes32", "bytes32"}, strings{}, FunctionType::Location::Log1)),
 					make_shared<MagicVariableDeclaration>("log2",
-							make_shared<FunctionType>(strings{"hash", "hash", "hash"},strings{}, FunctionType::Location::Log2)),
+							make_shared<FunctionType>(strings{"bytes32", "bytes32", "bytes32"}, strings{}, FunctionType::Location::Log2)),
 					make_shared<MagicVariableDeclaration>("log3",
-							make_shared<FunctionType>(strings{"hash", "hash", "hash", "hash"},strings{}, FunctionType::Location::Log3)),
+							make_shared<FunctionType>(strings{"bytes32", "bytes32", "bytes32", "bytes32"}, strings{}, FunctionType::Location::Log3)),
 					make_shared<MagicVariableDeclaration>("log4",
-							make_shared<FunctionType>(strings{"hash", "hash", "hash", "hash", "hash"},strings{}, FunctionType::Location::Log4)),
+							make_shared<FunctionType>(strings{"bytes32", "bytes32", "bytes32", "bytes32", "bytes32"}, strings{}, FunctionType::Location::Log4)),
 					make_shared<MagicVariableDeclaration>("sha256",
-							make_shared<FunctionType>(strings(), strings{"hash"}, FunctionType::Location::SHA256, true)),
+							make_shared<FunctionType>(strings(), strings{"bytes32"}, FunctionType::Location::SHA256, true)),
 					make_shared<MagicVariableDeclaration>("ecrecover",
-							make_shared<FunctionType>(strings{"hash", "hash8", "hash", "hash"}, strings{"address"}, FunctionType::Location::ECRecover)),
+							make_shared<FunctionType>(strings{"bytes32", "uint8", "bytes32", "bytes32"}, strings{"address"}, FunctionType::Location::ECRecover)),
 					make_shared<MagicVariableDeclaration>("ripemd160",
-							make_shared<FunctionType>(strings(), strings{"hash160"}, FunctionType::Location::RIPEMD160, true))})
+							make_shared<FunctionType>(strings(), strings{"bytes20"}, FunctionType::Location::RIPEMD160, true))})
 {
 }
 
diff --git a/libsolidity/LValue.cpp b/libsolidity/LValue.cpp
index a036be80b..68d6797eb 100644
--- a/libsolidity/LValue.cpp
+++ b/libsolidity/LValue.cpp
@@ -167,6 +167,7 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc
 				// stack: source_ref target_ref member_offset source_member_ref
 				StorageItem(m_context, *memberType).retrieveValue(_location, true);
 				// stack: source_ref target_ref member_offset source_value...
+				solAssert(2 + memberType->getSizeOnStack() <= 16, "Stack too deep.");
 				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
@@ -234,7 +235,7 @@ void StorageItem::setToZero(SourceLocation const&, bool _removeReference) const
 }
 
 /// Used in StorageByteArrayElement
-static IntegerType byteType(8, IntegerType::Modifier::Hash);
+static FixedBytesType byteType(1);
 
 StorageByteArrayElement::StorageByteArrayElement(CompilerContext& _compilerContext):
 	LValue(_compilerContext, byteType)
@@ -250,6 +251,7 @@ void StorageByteArrayElement::retrieveValue(SourceLocation const&, bool _remove)
 	else
 		m_context << eth::Instruction::DUP2 << eth::Instruction::SLOAD
 			<< eth::Instruction::DUP2 << eth::Instruction::BYTE;
+	m_context << (u256(1) << (256 - 8)) << eth::Instruction::MUL;
 }
 
 void StorageByteArrayElement::storeValue(Type const&, SourceLocation const&, bool _move) const
@@ -265,8 +267,9 @@ void StorageByteArrayElement::storeValue(Type const&, SourceLocation const&, boo
 	m_context << eth::Instruction::DUP2 << u256(0xff) << eth::Instruction::MUL
 		<< eth::Instruction::NOT << eth::Instruction::AND;
 	// stack: value ref (1<<(32-byte_number)) old_full_value_with_cleared_byte
-	m_context << eth::Instruction::SWAP1 << eth::Instruction::DUP4 << eth::Instruction::MUL
-		<< eth::Instruction::OR;
+	m_context << eth::Instruction::SWAP1;
+	m_context << (u256(1) << (256 - 8)) << eth::Instruction::DUP5 << eth::Instruction::DIV
+		<< eth::Instruction::MUL << eth::Instruction::OR;
 	// stack: value ref new_full_value
 	m_context << eth::Instruction::SWAP1 << eth::Instruction::SSTORE;
 	if (_move)
diff --git a/libsolidity/Token.h b/libsolidity/Token.h
index 85979b566..2d8a49fcd 100644
--- a/libsolidity/Token.h
+++ b/libsolidity/Token.h
@@ -252,77 +252,44 @@ namespace solidity
 	K(UInt240, "uint240", 0)                                           \
 	K(UInt248, "uint248", 0)                                           \
 	K(UInt256, "uint256", 0)                                           \
-	K(Hash, "hash", 0)                                                 \
-	K(Hash8, "hash8", 0)                                               \
-	K(Hash16, "hash16", 0)                                             \
-	K(Hash24, "hash24", 0)                                             \
-	K(Hash32, "hash32", 0)                                             \
-	K(Hash40, "hash40", 0)                                             \
-	K(Hash48, "hash48", 0)                                             \
-	K(Hash56, "hash56", 0)                                             \
-	K(Hash64, "hash64", 0)                                             \
-	K(Hash72, "hash72", 0)                                             \
-	K(Hash80, "hash80", 0)                                             \
-	K(Hash88, "hash88", 0)                                             \
-	K(Hash96, "hash96", 0)                                             \
-	K(Hash104, "hash104", 0)                                           \
-	K(Hash112, "hash112", 0)                                           \
-	K(Hash120, "hash120", 0)                                           \
-	K(Hash128, "hash128", 0)                                           \
-	K(Hash136, "hash136", 0)                                           \
-	K(Hash144, "hash144", 0)                                           \
-	K(Hash152, "hash152", 0)                                           \
-	K(Hash160, "hash160", 0)                                           \
-	K(Hash168, "hash168", 0)                                           \
-	K(Hash176, "hash178", 0)                                           \
-	K(Hash184, "hash184", 0)                                           \
-	K(Hash192, "hash192", 0)                                           \
-	K(Hash200, "hash200", 0)                                           \
-	K(Hash208, "hash208", 0)                                           \
-	K(Hash216, "hash216", 0)                                           \
-	K(Hash224, "hash224", 0)                                           \
-	K(Hash232, "hash232", 0)                                           \
-	K(Hash240, "hash240", 0)                                           \
-	K(Hash248, "hash248", 0)                                           \
-	K(Hash256, "hash256", 0)                                           \
+	K(Bytes0, "bytes0", 0)                                             \
+	K(Bytes1, "bytes1", 0)                                             \
+	K(Bytes2, "bytes2", 0)                                             \
+	K(Bytes3, "bytes3", 0)                                             \
+	K(Bytes4, "bytes4", 0)                                             \
+	K(Bytes5, "bytes5", 0)                                             \
+	K(Bytes6, "bytes6", 0)                                             \
+	K(Bytes7, "bytes7", 0)                                             \
+	K(Bytes8, "bytes8", 0)                                             \
+	K(Bytes9, "bytes9", 0)                                             \
+	K(Bytes10, "bytes10", 0)                                           \
+	K(Bytes11, "bytes11", 0)                                           \
+	K(Bytes12, "bytes12", 0)                                           \
+	K(Bytes13, "bytes13", 0)                                           \
+	K(Bytes14, "bytes14", 0)                                           \
+	K(Bytes15, "bytes15", 0)                                           \
+	K(Bytes16, "bytes16", 0)                                           \
+	K(Bytes17, "bytes17", 0)                                           \
+	K(Bytes18, "bytes18", 0)                                           \
+	K(Bytes19, "bytes19", 0)                                           \
+	K(Bytes20, "bytes20", 0)                                           \
+	K(Bytes21, "bytes21", 0)                                           \
+	K(Bytes22, "bytes22", 0)                                           \
+	K(Bytes23, "bytes23", 0)                                           \
+	K(Bytes24, "bytes24", 0)                                           \
+	K(Bytes25, "bytes25", 0)                                           \
+	K(Bytes26, "bytes26", 0)                                           \
+	K(Bytes27, "bytes27", 0)                                           \
+	K(Bytes28, "bytes28", 0)                                           \
+	K(Bytes29, "bytes29", 0)                                           \
+	K(Bytes30, "bytes30", 0)                                           \
+	K(Bytes31, "bytes31", 0)                                           \
+	K(Bytes32, "bytes32", 0)                                           \
+	K(Bytes, "bytes", 0)                                               \
+	K(Byte, "byte", 0)                                                 \
 	K(Address, "address", 0)                                           \
 	K(Bool, "bool", 0)                                                 \
-	K(Bytes, "bytes", 0)                                               \
 	K(StringType, "string", 0)                                         \
-	K(String0, "string0", 0)                                           \
-	K(String1, "string1", 0)                                           \
-	K(String2, "string2", 0)                                           \
-	K(String3, "string3", 0)                                           \
-	K(String4, "string4", 0)                                           \
-	K(String5, "string5", 0)                                           \
-	K(String6, "string6", 0)                                           \
-	K(String7, "string7", 0)                                           \
-	K(String8, "string8", 0)                                           \
-	K(String9, "string9", 0)                                           \
-	K(String10, "string10", 0)                                         \
-	K(String11, "string11", 0)                                         \
-	K(String12, "string12", 0)                                         \
-	K(String13, "string13", 0)                                         \
-	K(String14, "string14", 0)                                         \
-	K(String15, "string15", 0)                                         \
-	K(String16, "string16", 0)                                         \
-	K(String17, "string17", 0)                                         \
-	K(String18, "string18", 0)                                         \
-	K(String19, "string19", 0)                                         \
-	K(String20, "string20", 0)                                         \
-	K(String21, "string21", 0)                                         \
-	K(String22, "string22", 0)                                         \
-	K(String23, "string23", 0)                                         \
-	K(String24, "string24", 0)                                         \
-	K(String25, "string25", 0)                                         \
-	K(String26, "string26", 0)                                         \
-	K(String27, "string27", 0)                                         \
-	K(String28, "string28", 0)                                         \
-	K(String29, "string29", 0)                                         \
-	K(String30, "string30", 0)                                         \
-	K(String31, "string31", 0)                                         \
-	K(String32, "string32", 0)                                         \
-	K(Text, "text", 0)                                                 \
 	K(Real, "real", 0)                                                 \
 	K(UReal, "ureal", 0)                                               \
 	T(TypesEnd, NULL, 0) /* used as type enum end marker */            \
diff --git a/libsolidity/Types.cpp b/libsolidity/Types.cpp
index 454d79d9b..bd55e2a8b 100644
--- a/libsolidity/Types.cpp
+++ b/libsolidity/Types.cpp
@@ -37,26 +37,36 @@ namespace solidity
 
 TypePointer Type::fromElementaryTypeName(Token::Value _typeToken)
 {
-	solAssert(Token::isElementaryTypeName(_typeToken), "Elementary type name expected.");
+	char const* tokenCstr = Token::toString(_typeToken);
+	solAssert(Token::isElementaryTypeName(_typeToken),
+		"Expected an elementary type name but got " + ((tokenCstr) ? std::string(Token::toString(_typeToken)) : ""));
 
-	if (Token::Int <= _typeToken && _typeToken <= Token::Hash256)
+	if (Token::Int <= _typeToken && _typeToken <= Token::Bytes32)
 	{
 		int offset = _typeToken - Token::Int;
 		int bytes = offset % 33;
-		if (bytes == 0)
+		if (bytes == 0 && _typeToken != Token::Bytes0)
 			bytes = 32;
 		int modifier = offset / 33;
-		return make_shared<IntegerType>(bytes * 8,
-										modifier == 0 ? IntegerType::Modifier::Signed :
-										modifier == 1 ? IntegerType::Modifier::Unsigned :
-										IntegerType::Modifier::Hash);
+		switch(modifier)
+		{
+		case 0:
+			return make_shared<IntegerType>(bytes * 8, IntegerType::Modifier::Signed);
+		case 1:
+			return make_shared<IntegerType>(bytes * 8, IntegerType::Modifier::Unsigned);
+		case 2:
+			return make_shared<FixedBytesType>(bytes);
+		default:
+			solAssert(false, "Unexpected modifier value. Should never happen");
+			return TypePointer();
+		}
 	}
+	else if (_typeToken == Token::Byte)
+		return make_shared<FixedBytesType>(1);
 	else if (_typeToken == Token::Address)
 		return make_shared<IntegerType>(0, IntegerType::Modifier::Address);
 	else if (_typeToken == Token::Bool)
 		return make_shared<BoolType>();
-	else if (Token::String0 <= _typeToken && _typeToken <= Token::String32)
-		return make_shared<StaticStringType>(int(_typeToken) - int(Token::String0));
 	else if (_typeToken == Token::Bytes)
 		return make_shared<ArrayType>(ArrayType::Location::Storage);
 	else
@@ -123,7 +133,7 @@ TypePointer Type::forLiteral(Literal const& _literal)
 		return make_shared<IntegerConstantType>(_literal);
 	case Token::StringLiteral:
 		//@todo put larger strings into dynamic strings
-		return StaticStringType::smallestTypeForLiteral(_literal.getValue());
+		return FixedBytesType::smallestTypeForLiteral(_literal.getValue());
 	default:
 		return shared_ptr<Type>();
 	}
@@ -159,8 +169,6 @@ bool IntegerType::isImplicitlyConvertibleTo(Type const& _convertTo) const
 		return false;
 	if (isAddress())
 		return convertTo.isAddress();
-	else if (isHash())
-		return convertTo.isHash();
 	else if (isSigned())
 		return convertTo.isSigned();
 	else
@@ -169,14 +177,10 @@ bool IntegerType::isImplicitlyConvertibleTo(Type const& _convertTo) const
 
 bool IntegerType::isExplicitlyConvertibleTo(Type const& _convertTo) const
 {
-	if (_convertTo.getCategory() == Category::String)
-	{
-		StaticStringType const& convertTo = dynamic_cast<StaticStringType const&>(_convertTo);
-		return isHash() && (m_bits == convertTo.getNumBytes() * 8);
-	}
 	return _convertTo.getCategory() == getCategory() ||
-		   _convertTo.getCategory() == Category::Contract ||
-		   _convertTo.getCategory() == Category::Enum;
+		_convertTo.getCategory() == Category::Contract ||
+		_convertTo.getCategory() == Category::Enum ||
+		_convertTo.getCategory() == Category::FixedBytes;
 }
 
 TypePointer IntegerType::unaryOperatorResult(Token::Value _operator) const
@@ -187,16 +191,10 @@ TypePointer IntegerType::unaryOperatorResult(Token::Value _operator) const
 	// no further unary operators for addresses
 	else if (isAddress())
 		return TypePointer();
-	// "~" is ok for all other types
-	else if (_operator == Token::BitNot)
-		return shared_from_this();
-	// nothing else for hashes
-	else if (isHash())
-		return TypePointer();
-	// for non-hash integers, we allow +, -, ++ and --
+	// for non-address integers, we allow +, -, ++ and --
 	else if (_operator == Token::Add || _operator == Token::Sub ||
 			_operator == Token::Inc || _operator == Token::Dec ||
-			_operator == Token::After)
+			_operator == Token::After || _operator == Token::BitNot)
 		return shared_from_this();
 	else
 		return TypePointer();
@@ -214,7 +212,7 @@ string IntegerType::toString() const
 {
 	if (isAddress())
 		return "address";
-	string prefix = isHash() ? "hash" : (isSigned() ? "int" : "uint");
+	string prefix = isSigned() ? "int" : "uint";
 	return prefix + dev::toString(m_bits);
 }
 
@@ -230,14 +228,11 @@ TypePointer IntegerType::binaryOperatorResult(Token::Value _operator, TypePointe
 	// All integer types can be compared
 	if (Token::isCompareOp(_operator))
 		return commonType;
-
-	// Nothing else can be done with addresses, but hashes can receive bit operators
+	// Nothing else can be done with addresses
 	if (commonType->isAddress())
 		return TypePointer();
-	else if (commonType->isHash() && !Token::isBitOp(_operator))
-		return TypePointer();
-	else
-		return commonType;
+
+	return commonType;
 }
 
 const MemberList IntegerType::AddressMemberList =
@@ -284,8 +279,17 @@ IntegerConstantType::IntegerConstantType(Literal const& _literal)
 
 bool IntegerConstantType::isImplicitlyConvertibleTo(Type const& _convertTo) const
 {
-	TypePointer integerType = getIntegerType();
-	return integerType && integerType->isImplicitlyConvertibleTo(_convertTo);
+	shared_ptr<IntegerType const> integerType = getIntegerType();
+	if (!integerType)
+		return false;
+
+	if (_convertTo.getCategory() == Category::FixedBytes)
+	{
+		FixedBytesType const& convertTo = dynamic_cast<FixedBytesType const&>(_convertTo);
+		return convertTo.getNumBytes() * 8 >= integerType->getNumBits();
+	}
+
+	return integerType->isImplicitlyConvertibleTo(_convertTo);
 }
 
 bool IntegerConstantType::isExplicitlyConvertibleTo(Type const& _convertTo) const
@@ -433,50 +437,73 @@ shared_ptr<IntegerType const> IntegerConstantType::getIntegerType() const
 												 : IntegerType::Modifier::Unsigned);
 }
 
-shared_ptr<StaticStringType> StaticStringType::smallestTypeForLiteral(string const& _literal)
+shared_ptr<FixedBytesType> FixedBytesType::smallestTypeForLiteral(string const& _literal)
 {
 	if (_literal.length() <= 32)
-		return make_shared<StaticStringType>(_literal.length());
-	return shared_ptr<StaticStringType>();
+		return make_shared<FixedBytesType>(_literal.length());
+	return shared_ptr<FixedBytesType>();
 }
 
-StaticStringType::StaticStringType(int _bytes): m_bytes(_bytes)
+FixedBytesType::FixedBytesType(int _bytes): m_bytes(_bytes)
 {
 	solAssert(m_bytes >= 0 && m_bytes <= 32,
-			  "Invalid byte number for static string type: " + dev::toString(m_bytes));
+			  "Invalid byte number for fixed bytes type: " + dev::toString(m_bytes));
 }
 
-bool StaticStringType::isImplicitlyConvertibleTo(Type const& _convertTo) const
+bool FixedBytesType::isImplicitlyConvertibleTo(Type const& _convertTo) const
 {
 	if (_convertTo.getCategory() != getCategory())
 		return false;
-	StaticStringType const& convertTo = dynamic_cast<StaticStringType const&>(_convertTo);
+	FixedBytesType const& convertTo = dynamic_cast<FixedBytesType const&>(_convertTo);
 	return convertTo.m_bytes >= m_bytes;
 }
 
-bool StaticStringType::isExplicitlyConvertibleTo(Type const& _convertTo) const
+bool FixedBytesType::isExplicitlyConvertibleTo(Type const& _convertTo) const
 {
-	if (_convertTo.getCategory() == getCategory())
-		return true;
 	if (_convertTo.getCategory() == Category::Integer)
 	{
 		IntegerType const& convertTo = dynamic_cast<IntegerType const&>(_convertTo);
-		if (convertTo.isHash() && (m_bytes * 8 == convertTo.getNumBits()))
+		if (m_bytes * 8 <= convertTo.getNumBits())
 			return true;
 	}
 
-	return false;
+	return _convertTo.getCategory() == Category::Contract ||
+		_convertTo.getCategory() == getCategory();
+}
+
+TypePointer FixedBytesType::unaryOperatorResult(Token::Value _operator) const
+{
+	// "delete" and "~" is okay for FixedBytesType
+	if (_operator == Token::Delete)
+		return make_shared<VoidType>();
+	else if (_operator == Token::BitNot)
+		return shared_from_this();
+
+	return TypePointer();
+}
+
+TypePointer FixedBytesType::binaryOperatorResult(Token::Value _operator, TypePointer const& _other) const
+{
+	auto commonType = dynamic_pointer_cast<FixedBytesType const>(Type::commonType(shared_from_this(), _other));
+	if (!commonType)
+		return TypePointer();
+
+	// FixedBytes can be compared and have bitwise operators applied to them
+	if (Token::isCompareOp(_operator) || Token::isBitOp(_operator))
+		return commonType;
+
+	return TypePointer();
 }
 
-bool StaticStringType::operator==(Type const& _other) const
+bool FixedBytesType::operator==(Type const& _other) const
 {
 	if (_other.getCategory() != getCategory())
 		return false;
-	StaticStringType const& other = dynamic_cast<StaticStringType const&>(_other);
+	FixedBytesType const& other = dynamic_cast<FixedBytesType const&>(_other);
 	return other.m_bytes == m_bytes;
 }
 
-u256 StaticStringType::literalValue(const Literal* _literal) const
+u256 FixedBytesType::literalValue(const Literal* _literal) const
 {
 	solAssert(_literal, "");
 	u256 value = 0;
@@ -1124,7 +1151,7 @@ MagicType::MagicType(MagicType::Kind _kind):
 	case Kind::Block:
 		m_members = MemberList({{"coinbase", make_shared<IntegerType>(0, IntegerType::Modifier::Address)},
 								{"timestamp", make_shared<IntegerType>(256)},
-								{"blockhash", make_shared<FunctionType>(strings{"uint"}, strings{"hash"}, FunctionType::Location::BlockHash)},
+								{"blockhash", make_shared<FunctionType>(strings{"uint"}, strings{"bytes32"}, FunctionType::Location::BlockHash)},
 								{"difficulty", make_shared<IntegerType>(256)},
 								{"number", make_shared<IntegerType>(256)},
 								{"gaslimit", make_shared<IntegerType>(256)}});
diff --git a/libsolidity/Types.h b/libsolidity/Types.h
index 6cef8d64a..fd59a37ad 100644
--- a/libsolidity/Types.h
+++ b/libsolidity/Types.h
@@ -77,12 +77,12 @@ public:
 	enum class Category
 	{
 		Integer, IntegerConstant, Bool, Real, Array,
-		String, Contract, Struct, Function, Enum,
+		FixedBytes, Contract, Struct, Function, Enum,
 		Mapping, Void, TypeType, Modifier, Magic
 	};
 
-	///@{
-	///@name Factory functions
+	/// @{
+	/// @name Factory functions
 	/// Factory functions that convert an AST @ref TypeName to a Type.
 	static TypePointer fromElementaryTypeName(Token::Value _typeToken);
 	static TypePointer fromElementaryTypeName(std::string const& _name);
@@ -158,14 +158,14 @@ protected:
 };
 
 /**
- * Any kind of integer type including hash and address.
+ * Any kind of integer type (signed, unsigned, address).
  */
 class IntegerType: public Type
 {
 public:
 	enum class Modifier
 	{
-		Unsigned, Signed, Hash, Address
+		Unsigned, Signed, Address
 	};
 	virtual Category getCategory() const override { return Category::Integer; }
 
@@ -186,7 +186,6 @@ public:
 	virtual std::string toString() const override;
 
 	int getNumBits() const { return m_bits; }
-	bool isHash() const { return m_modifier == Modifier::Hash || m_modifier == Modifier::Address; }
 	bool isAddress() const { return m_modifier == Modifier::Address; }
 	bool isSigned() const { return m_modifier == Modifier::Signed; }
 
@@ -232,27 +231,29 @@ private:
 };
 
 /**
- * String type with fixed length, up to 32 bytes.
+ * Bytes type with fixed length of up to 32 bytes.
  */
-class StaticStringType: public Type
+class FixedBytesType: public Type
 {
 public:
-	virtual Category getCategory() const override { return Category::String; }
+	virtual Category getCategory() const override { return Category::FixedBytes; }
 
-	/// @returns the smallest string type for the given literal or an empty pointer
+	/// @returns the smallest bytes type for the given literal or an empty pointer
 	/// if no type fits.
-	static std::shared_ptr<StaticStringType> smallestTypeForLiteral(std::string const& _literal);
+	static std::shared_ptr<FixedBytesType> smallestTypeForLiteral(std::string const& _literal);
 
-	explicit StaticStringType(int _bytes);
+	explicit FixedBytesType(int _bytes);
 
 	virtual bool isImplicitlyConvertibleTo(Type const& _convertTo) const override;
 	virtual bool isExplicitlyConvertibleTo(Type const& _convertTo) const override;
 	virtual bool operator==(Type const& _other) const override;
+	virtual TypePointer unaryOperatorResult(Token::Value _operator) const override;
+	virtual TypePointer binaryOperatorResult(Token::Value _operator, TypePointer const& _other) const override;
 
 	virtual unsigned getCalldataEncodedSize(bool _padded) const override { return _padded && m_bytes > 0 ? 32 : m_bytes; }
 	virtual bool isValueType() const override { return true; }
 
-	virtual std::string toString() const override { return "string" + dev::toString(m_bytes); }
+	virtual std::string toString() const override { return "bytes" + dev::toString(m_bytes); }
 	virtual u256 literalValue(Literal const* _literal) const override;
 
 	int getNumBytes() const { return m_bytes; }
diff --git a/libweb3jsonrpc/CMakeLists.txt b/libweb3jsonrpc/CMakeLists.txt
index b445f77ff..d3f4b70b6 100644
--- a/libweb3jsonrpc/CMakeLists.txt
+++ b/libweb3jsonrpc/CMakeLists.txt
@@ -56,4 +56,5 @@ endif()
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
 
+add_custom_target(aux_json SOURCES "spec.json")
 
diff --git a/libweb3jsonrpc/WebThreeStubServerBase.cpp b/libweb3jsonrpc/WebThreeStubServerBase.cpp
index 70c8ca9de..0434d1e76 100644
--- a/libweb3jsonrpc/WebThreeStubServerBase.cpp
+++ b/libweb3jsonrpc/WebThreeStubServerBase.cpp
@@ -24,6 +24,8 @@
 // Make sure boost/asio.hpp is included before windows.h.
 #include <boost/asio.hpp>
 
+#include <jsonrpccpp/common/exception.h>
+#include <libdevcore/CommonData.h>
 #include <libsolidity/CompilerStack.h>
 #include <libsolidity/Scanner.h>
 #include <libsolidity/SourceReferenceFormatter.h>
@@ -41,10 +43,10 @@
 #include "AccountHolder.h"
 
 using namespace std;
+using namespace jsonrpc;
 using namespace dev;
 using namespace dev::eth;
 
-
 static Json::Value toJson(dev::eth::BlockInfo const& _bi)
 {
 	Json::Value res;
@@ -55,10 +57,10 @@ static Json::Value toJson(dev::eth::BlockInfo const& _bi)
 	res["stateRoot"] = toJS(_bi.stateRoot);
 	res["transactionsRoot"] = toJS(_bi.transactionsRoot);
 	res["difficulty"] = toJS(_bi.difficulty);
-	res["number"] = (int)_bi.number;
-	res["gasLimit"] = (int)_bi.gasLimit;
-	res["timestamp"] = (int)_bi.timestamp;
-	res["extraData"] = jsFromBinary(_bi.extraData);
+	res["number"] = toJS(_bi.number);
+	res["gasLimit"] = toJS(_bi.gasLimit);
+	res["timestamp"] = toJS(_bi.timestamp);
+	res["extraData"] = toJS(_bi.extraData);
 	res["nonce"] = toJS(_bi.nonce);
 	return res;
 }
@@ -67,16 +69,34 @@ static Json::Value toJson(dev::eth::Transaction const& _t)
 {
 	Json::Value res;
 	res["hash"] = toJS(_t.sha3());
-	res["input"] = jsFromBinary(_t.data());
+	res["input"] = toJS(_t.data());
 	res["to"] = toJS(_t.receiveAddress());
 	res["from"] = toJS(_t.safeSender());
-	res["gas"] = (int)_t.gas();
+	res["gas"] = toJS(_t.gas());
 	res["gasPrice"] = toJS(_t.gasPrice());
 	res["nonce"] = toJS(_t.nonce());
 	res["value"] = toJS(_t.value());
 	return res;
 }
 
+static Json::Value toJson(dev::eth::BlockInfo const& _bi, Transactions const& _ts)
+{
+	Json::Value res = toJson(_bi);
+	res["transactions"] = Json::Value(Json::arrayValue);
+	for (Transaction const& t: _ts)
+		res["transactions"].append(toJson(t));
+	return res;
+}
+
+static Json::Value toJson(dev::eth::BlockInfo const& _bi, TransactionHashes const& _ts)
+{
+	Json::Value res = toJson(_bi);
+	res["transactions"] = Json::Value(Json::arrayValue);
+	for (h256 const& t: _ts)
+		res["transactions"].append(toJS(t));
+	return res;
+}
+
 static Json::Value toJson(dev::eth::TransactionSkeleton const& _t)
 {
 	Json::Value res;
@@ -85,7 +105,7 @@ static Json::Value toJson(dev::eth::TransactionSkeleton const& _t)
 	res["gas"] = toJS(_t.gas);
 	res["gasPrice"] = toJS(_t.gasPrice);
 	res["value"] = toJS(_t.value);
-	res["data"] = jsFromBinary(_t.data);
+	res["data"] = toJS(_t.data, 32);
 	return res;
 }
 
@@ -93,10 +113,11 @@ static Json::Value toJson(dev::eth::LocalisedLogEntry const& _e)
 {
 	Json::Value res;
 
-	res["data"] = jsFromBinary(_e.data);
+	res["data"] = toJS(_e.data);
 	res["address"] = toJS(_e.address);
+	res["topics"] = Json::Value(Json::arrayValue);
 	for (auto const& t: _e.topics)
-		res["topic"].append(toJS(t));
+		res["topics"].append(toJS(t));
 	res["number"] = _e.number;
 	res["hash"] = toJS(_e.sha3);
 	return res;
@@ -110,7 +131,7 @@ static Json::Value toJson(dev::eth::LocalisedLogEntries const& _es)	// commented
 	return res;
 }
 
-static Json::Value toJson(std::map<u256, u256> const& _storage)
+static Json::Value toJson(map<u256, u256> const& _storage)
 {
 	Json::Value res(Json::objectValue);
 	for (auto i: _storage)
@@ -124,49 +145,33 @@ static dev::eth::LogFilter toLogFilter(Json::Value const& _json)	// commented to
 	if (!_json.isObject() || _json.empty())
 		return filter;
 
-	if (_json["earliest"].isInt())
-		filter.withEarliest(_json["earliest"].asInt());
-	if (_json["latest"].isInt())
-		filter.withLatest(_json["lastest"].asInt());
-	if (_json["max"].isInt())
-		filter.withMax(_json["max"].asInt());
-	if (_json["skip"].isInt())
-		filter.withSkip(_json["skip"].asInt());
+	// check only !empty. it should throw exceptions if input params are incorrect
+	if (!_json["fromBlock"].empty())
+		filter.withEarliest(jsToInt(_json["fromBlock"].asString()));
+	if (!_json["toBlock"].empty())
+		filter.withLatest(jsToInt(_json["toBlock"].asString()));
 	if (!_json["address"].empty())
 	{
 		if (_json["address"].isArray())
-		{
 			for (auto i : _json["address"])
-				if (i.isString())
-					filter.address(jsToAddress(i.asString()));
-		}
-		else if (_json["address"].isString())
+				filter.address(jsToAddress(i.asString()));
+		else
 			filter.address(jsToAddress(_json["address"].asString()));
 	}
-	if (!_json["topic"].empty() && _json["topic"].isArray())
-	{
-		unsigned i = 0;
-		for (auto t: _json["topic"])
-		{
-			if (t.isArray())
-				for (auto tt: t)
-					filter.topic(i, jsToFixed<32>(tt.asString()));
-			else if (t.isString())
-				filter.topic(i, jsToFixed<32>(t.asString()));
-			i++;
-		}
-	}
+	if (!_json["topics"].empty())
+		for (unsigned i = 0; i < _json["topics"].size(); i++)
+			filter.topic(i, jsToFixed<32>(_json["topics"][i].asString()));
 	return filter;
 }
 
 static shh::Message toMessage(Json::Value const& _json)
 {
 	shh::Message ret;
-	if (_json["from"].isString())
+	if (!_json["from"].empty())
 		ret.setFrom(jsToPublic(_json["from"].asString()));
-	if (_json["to"].isString())
+	if (!_json["to"].empty())
 		ret.setTo(jsToPublic(_json["to"].asString()));
-	if (_json["payload"].isString())
+	if (!_json["payload"].empty())
 		ret.setPayload(jsToBytes(_json["payload"].asString()));
 	return ret;
 }
@@ -177,19 +182,16 @@ static shh::Envelope toSealed(Json::Value const& _json, shh::Message const& _m,
 	unsigned workToProve = 50;
 	shh::BuildTopic bt;
 
-	if (_json["ttl"].isInt())
-		ttl = _json["ttl"].asInt();
-	if (_json["workToProve"].isInt())
-		workToProve = _json["workToProve"].asInt();
-	if (!_json["topic"].empty())
-	{
-		if (_json["topic"].isString())
-			bt.shift(jsToBytes(_json["topic"].asString()));
-		else if (_json["topic"].isArray())
-			for (auto i: _json["topic"])
-				if (i.isString())
-					bt.shift(jsToBytes(i.asString()));
-	}
+	if (!_json["ttl"].empty())
+		ttl = jsToInt(_json["ttl"].asString());
+	
+	if (!_json["workToProve"].empty())
+		workToProve = jsToInt(_json["workToProve"].asString());
+	
+	if (!_json["topics"].empty())
+		for (auto i: _json["topics"])
+			bt.shift(jsToBytes(i.asString()));
+	
 	return _m.seal(_from, bt, ttl, workToProve);
 }
 
@@ -198,18 +200,13 @@ static pair<shh::FullTopic, Public> toWatch(Json::Value const& _json)
 	shh::BuildTopic bt;
 	Public to;
 
-	if (_json["to"].isString())
+	if (!_json["to"].empty())
 		to = jsToPublic(_json["to"].asString());
 
-	if (!_json["topic"].empty())
-	{
-		if (_json["topic"].isString())
-			bt.shift(jsToBytes(_json["topic"].asString()));
-		else if (_json["topic"].isArray())
-			for (auto i: _json["topic"])
-				if (i.isString())
-					bt.shift(jsToBytes(i.asString()));
-	}
+	if (!_json["topics"].empty())
+		for (auto i: _json["topics"])
+			bt.shift(jsToBytes(i.asString()));
+	
 	return make_pair(bt, to);
 }
 
@@ -217,290 +214,372 @@ static Json::Value toJson(h256 const& _h, shh::Envelope const& _e, shh::Message
 {
 	Json::Value res;
 	res["hash"] = toJS(_h);
-	res["expiry"] = (int)_e.expiry();
-	res["sent"] = (int)_e.sent();
-	res["ttl"] = (int)_e.ttl();
-	res["workProved"] = (int)_e.workProved();
+	res["expiry"] = toJS(_e.expiry());
+	res["sent"] = toJS(_e.sent());
+	res["ttl"] = toJS(_e.ttl());
+	res["workProved"] = toJS(_e.workProved());
+	res["topics"] = Json::Value(Json::arrayValue);
 	for (auto const& t: _e.topic())
-		res["topic"].append(toJS(t));
+		res["topics"].append(toJS(t));
 	res["payload"] = toJS(_m.payload());
 	res["from"] = toJS(_m.from());
 	res["to"] = toJS(_m.to());
 	return res;
 }
 
-WebThreeStubServerBase::WebThreeStubServerBase(jsonrpc::AbstractServerConnector& _conn, std::vector<dev::KeyPair> const& _accounts):
-	AbstractWebThreeStubServer(_conn), m_accounts(make_shared<AccountHolder>(std::bind(&WebThreeStubServerBase::client, this)))
+static int toBlockNumber(string const& _string)
+{
+	if (_string.compare("latest") == 0)
+		return -1;
+	if (_string.compare("pending") == 0)
+		return 0;
+	return jsToInt(_string);
+}
+
+WebThreeStubServerBase::WebThreeStubServerBase(AbstractServerConnector& _conn, vector<dev::KeyPair> const& _accounts):
+	AbstractWebThreeStubServer(_conn), m_accounts(make_shared<AccountHolder>(bind(&WebThreeStubServerBase::client, this)))
 {
 	m_accounts->setAccounts(_accounts);
 }
 
-void WebThreeStubServerBase::setIdentities(std::vector<dev::KeyPair> const& _ids)
+void WebThreeStubServerBase::setIdentities(vector<dev::KeyPair> const& _ids)
 {
 	m_ids.clear();
 	for (auto i: _ids)
 		m_ids[i.pub()] = i.secret();
 }
 
-std::string WebThreeStubServerBase::web3_sha3(std::string const& _param1)
+string WebThreeStubServerBase::web3_sha3(string const& _param1)
 {
 	return toJS(sha3(jsToBytes(_param1)));
 }
 
-Json::Value WebThreeStubServerBase::eth_accounts()
-{
-	Json::Value ret(Json::arrayValue);
-	for (auto const& i: m_accounts->getAllAccounts())
-		ret.append(toJS(i));
-	return ret;
-}
-
-std::string WebThreeStubServerBase::shh_addToGroup(std::string const& _group, std::string const& _who)
-{
-	(void)_group;
-	(void)_who;
-	return "";
-}
-
-std::string WebThreeStubServerBase::eth_balanceAt(string const& _address)
+string WebThreeStubServerBase::net_peerCount()
 {
-	return toJS(client()->balanceAt(jsToAddress(_address), client()->getDefault()));
+	return toJS(network()->peerCount());
 }
 
-Json::Value WebThreeStubServerBase::eth_blockByHash(std::string const& _hash)
+bool WebThreeStubServerBase::net_listening()
 {
-	return toJson(client()->blockInfo(jsToFixed<32>(_hash)));
+	return network()->isNetworkStarted();
 }
 
-Json::Value WebThreeStubServerBase::eth_blockByNumber(int _number)
+string WebThreeStubServerBase::eth_coinbase()
 {
-	return toJson(client()->blockInfo(client()->hashFromNumber(_number)));
+	return toJS(client()->address());
 }
 
-static TransactionSkeleton toTransaction(Json::Value const& _json)
+bool WebThreeStubServerBase::eth_mining()
 {
-	TransactionSkeleton ret;
-	if (!_json.isObject() || _json.empty())
-		return ret;
-
-	if (_json["from"].isString())
-		ret.from = jsToAddress(_json["from"].asString());
-	if (_json["to"].isString())
-		ret.to = jsToAddress(_json["to"].asString());
-	else
-		ret.creation = true;
-	if (!_json["value"].empty())
-	{
-		if (_json["value"].isString())
-			ret.value = jsToU256(_json["value"].asString());
-		else if (_json["value"].isInt())
-			ret.value = u256(_json["value"].asInt());
-	}
-	if (!_json["gas"].empty())
-	{
-		if (_json["gas"].isString())
-			ret.gas = jsToU256(_json["gas"].asString());
-		else if (_json["gas"].isInt())
-			ret.gas = u256(_json["gas"].asInt());
-	}
-	if (!_json["gasPrice"].empty())
-	{
-		if (_json["gasPrice"].isString())
-			ret.gasPrice = jsToU256(_json["gasPrice"].asString());
-		else if (_json["gasPrice"].isInt())
-			ret.gas = u256(_json["gas"].asInt());
-	}
-	if (!_json["data"].empty())
-	{
-		if (_json["data"].isString())							// ethereum.js has preconstructed the data array
-			ret.data = jsToBytes(_json["data"].asString());
-		else if (_json["data"].isArray())						// old style: array of 32-byte-padded values. TODO: remove PoC-8
-			for (auto i: _json["data"])
-				dev::operator +=(ret.data, padded(jsToBytes(i.asString()), 32));
-	}
-
-	if (_json["code"].isString())
-		ret.data = jsToBytes(_json["code"].asString());
-	return ret;
+	return client()->isMining();
 }
 
-bool WebThreeStubServerBase::eth_flush()
+string WebThreeStubServerBase::eth_gasPrice()
 {
-	client()->flushTransactions();
-	return true;
+	return toJS(10 * dev::eth::szabo);
 }
 
-std::string WebThreeStubServerBase::eth_call(Json::Value const& _json)
+Json::Value WebThreeStubServerBase::eth_accounts()
 {
-	std::string ret;
-	TransactionSkeleton t = toTransaction(_json);
-	if (!t.from)
-		t.from = m_accounts->getDefaultTransactAccount();
-	if (!m_accounts->isRealAccount(t.from))
-		return ret;
-	if (!t.gasPrice)
-		t.gasPrice = 10 * dev::eth::szabo;
-	if (!t.gas)
-		t.gas = min<u256>(client()->gasLimitRemaining(), client()->balanceAt(t.from) / t.gasPrice);
-	ret = toJS(client()->call(m_accounts->secretKey(t.from), t.value, t.to, t.data, t.gas, t.gasPrice));
+	Json::Value ret(Json::arrayValue);
+	for (auto const& i: m_accounts->getAllAccounts())
+		ret.append(toJS(i));
 	return ret;
 }
 
-Json::Value WebThreeStubServerBase::eth_changed(int _id)
+string WebThreeStubServerBase::eth_blockNumber()
 {
-	auto entries = client()->checkWatch(_id);
-	if (entries.size())
-		cnote << "FIRING WATCH" << _id << entries.size();
-	return toJson(entries);
+	return toJS(client()->number());
 }
 
-std::string WebThreeStubServerBase::eth_codeAt(string const& _address)
-{
-	return jsFromBinary(client()->codeAt(jsToAddress(_address), client()->getDefault()));
-}
 
-std::string WebThreeStubServerBase::eth_coinbase()
+string WebThreeStubServerBase::eth_getBalance(string const& _address, string const& _blockNumber)
 {
-	return toJS(client()->address());
+	try
+	{
+		return toJS(client()->balanceAt(jsToAddress(_address), toBlockNumber(_blockNumber)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-double WebThreeStubServerBase::eth_countAt(string const& _address)
+string WebThreeStubServerBase::eth_getStorageAt(string const& _address, string const& _position, string const& _blockNumber)
 {
-	return (double)(uint64_t)client()->countAt(jsToAddress(_address), client()->getDefault());
+	try
+	{
+		return toJS(client()->stateAt(jsToAddress(_address), jsToU256(_position), toBlockNumber(_blockNumber)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-double WebThreeStubServerBase::eth_transactionCountByHash(std::string const& _hash)
+string WebThreeStubServerBase::eth_getTransactionCount(string const& _address, string const& _blockNumber)
 {
-	return client()->transactionCount(jsToFixed<32>(_hash));
+	try
+	{
+		return toJS(client()->countAt(jsToAddress(_address), toBlockNumber(_blockNumber)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-double WebThreeStubServerBase::eth_transactionCountByNumber(int _number)
+string WebThreeStubServerBase::eth_getBlockTransactionCountByHash(string const& _blockHash)
 {
-	return client()->transactionCount(client()->hashFromNumber(_number));
+	try
+	{
+		return toJS(client()->transactionCount(jsToFixed<32>(_blockHash)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-double WebThreeStubServerBase::eth_uncleCountByHash(std::string const& _hash)
-{
-	return client()->transactionCount(jsToFixed<32>(_hash));
-}
 
-double WebThreeStubServerBase::eth_uncleCountByNumber(int _number)
+string WebThreeStubServerBase::eth_getBlockTransactionCountByNumber(string const& _blockNumber)
 {
-	return client()->transactionCount(client()->hashFromNumber(_number));
+	try
+	{
+		return toJS(client()->transactionCount(client()->hashFromNumber(toBlockNumber(_blockNumber))));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-int WebThreeStubServerBase::eth_defaultBlock()
+string WebThreeStubServerBase::eth_getUncleCountByBlockHash(string const& _blockHash)
 {
-	return client()->getDefault();
+	try
+	{
+		return toJS(client()->uncleCount(jsToFixed<32>(_blockHash)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-std::string WebThreeStubServerBase::eth_gasPrice()
+string WebThreeStubServerBase::eth_getUncleCountByBlockNumber(string const& _blockNumber)
 {
-	return toJS(10 * dev::eth::szabo);
+	try
+	{
+		return toJS(client()->uncleCount(client()->hashFromNumber(toBlockNumber(_blockNumber))));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-std::string WebThreeStubServerBase::db_get(std::string const& _name, std::string const& _key)
+string WebThreeStubServerBase::eth_getCode(string const& _address, string const& _blockNumber)
 {
-	string ret = db()->get(_name, _key);
-	return toJS(dev::asBytes(ret));
+	try
+	{
+		return toJS(client()->codeAt(jsToAddress(_address), toBlockNumber(_blockNumber)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-Json::Value WebThreeStubServerBase::eth_filterLogs(int _id)
+static TransactionSkeleton toTransaction(Json::Value const& _json)
 {
-	return toJson(client()->logs(_id));
-}
+	TransactionSkeleton ret;
+	if (!_json.isObject() || _json.empty())
+		return ret;
+	
+	if (!_json["from"].empty())
+		ret.from = jsToAddress(_json["from"].asString());
+	if (!_json["to"].empty())
+		ret.to = jsToAddress(_json["to"].asString());
+	else
+		ret.creation = true;
+	
+	if (!_json["value"].empty())
+		ret.value = jsToU256(_json["value"].asString());
 
-Json::Value WebThreeStubServerBase::eth_logs(Json::Value const& _json)
-{
-	return toJson(client()->logs(toLogFilter(_json)));
-}
+	if (!_json["gas"].empty())
+		ret.gas = jsToU256(_json["gas"].asString());
 
-std::string WebThreeStubServerBase::db_getString(std::string const& _name, std::string const& _key)
-{
-	return db()->get(_name, _key);;
-}
+	if (!_json["gasPrice"].empty())
+		ret.gasPrice = jsToU256(_json["gasPrice"].asString());
 
-bool WebThreeStubServerBase::shh_haveIdentity(std::string const& _id)
-{
-	return m_ids.count(jsToPublic(_id)) > 0;
+	if (!_json["data"].empty())							// ethereum.js has preconstructed the data array
+		ret.data = jsToBytes(_json["data"].asString());
+	
+	if (!_json["code"].empty())
+		ret.data = jsToBytes(_json["code"].asString());
+	return ret;
 }
 
-bool WebThreeStubServerBase::eth_listening()
+string WebThreeStubServerBase::eth_sendTransaction(Json::Value const& _json)
 {
-	return network()->isNetworkStarted();
+	TransactionSkeleton t;
+	
+	try
+	{
+		t = toTransaction(_json);
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
+	
+	string ret;
+	if (!t.from)
+		t.from = m_accounts->getDefaultTransactAccount();
+	if (t.creation)
+		ret = toJS(right160(sha3(rlpList(t.from, client()->countAt(t.from)))));;
+	if (!t.gasPrice)
+		t.gasPrice = 10 * dev::eth::szabo;		// TODO: should be determined by user somehow.
+	if (!t.gas)
+		t.gas = min<u256>(client()->gasLimitRemaining(), client()->balanceAt(t.from) / t.gasPrice);
+	
+	if (m_accounts->isRealAccount(t.from))
+		authenticate(t, false);
+	else if (m_accounts->isProxyAccount(t.from))
+		authenticate(t, true);
+	
+	return ret;
 }
 
-bool WebThreeStubServerBase::eth_mining()
-{
-	return client()->isMining();
-}
 
-int WebThreeStubServerBase::eth_newFilter(Json::Value const& _json)
+string WebThreeStubServerBase::eth_call(Json::Value const& _json, string const& _blockNumber)
 {
-	unsigned ret = -1;
-	ret = client()->installWatch(toLogFilter(_json));
+	TransactionSkeleton t;
+	int number;
+	
+	try
+	{
+		t = toTransaction(_json);
+		number = toBlockNumber(_blockNumber);
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
+	
+	string ret;
+	if (!t.from)
+		t.from = m_accounts->getDefaultTransactAccount();
+	if (!m_accounts->isRealAccount(t.from))
+		return ret;
+	if (!t.gasPrice)
+		t.gasPrice = 10 * dev::eth::szabo;
+	if (!t.gas)
+		t.gas = min<u256>(client()->gasLimitRemaining(), client()->balanceAt(t.from) / t.gasPrice);
+	ret = toJS(client()->call(m_accounts->secretKey(t.from), t.value, t.to, t.data, t.gas, t.gasPrice, number));
+	
 	return ret;
 }
 
-int WebThreeStubServerBase::eth_newFilterString(std::string const& _filter)
+bool WebThreeStubServerBase::eth_flush()
 {
-	unsigned ret = -1;
-	if (_filter.compare("chain") == 0)
-		ret = client()->installWatch(dev::eth::ChainChangedFilter);
-	else if (_filter.compare("pending") == 0)
-		ret = client()->installWatch(dev::eth::PendingChangedFilter);
-	return ret;
+	client()->flushTransactions();
+	return true;
 }
 
-Json::Value WebThreeStubServerBase::eth_getWork()
+Json::Value WebThreeStubServerBase::eth_getBlockByHash(string const& _blockHash, bool _includeTransactions)
 {
-	Json::Value ret(Json::arrayValue);
-	auto r = client()->getWork();
-	ret.append(toJS(r.first));
-	ret.append(toJS(r.second));
-	return ret;
+	try
+	{
+		auto h = jsToFixed<32>(_blockHash);
+		if (_includeTransactions)
+			return toJson(client()->blockInfo(h), client()->transactions(h));
+		else
+			return toJson(client()->blockInfo(h), client()->transactionHashes(h));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-bool WebThreeStubServerBase::eth_submitWork(std::string const& _nonce, std::string const& _mixHash)
+Json::Value WebThreeStubServerBase::eth_getBlockByNumber(string const& _blockNumber, bool _includeTransactions)
 {
-	return client()->submitWork(ProofOfWork::Proof{jsToFixed<Nonce::size>(_nonce), jsToFixed<32>(_mixHash)});
+	try
+	{
+		auto h = client()->hashFromNumber(jsToInt(_blockNumber));
+		if (_includeTransactions)
+			return toJson(client()->blockInfo(h), client()->transactions(h));
+		else
+			return toJson(client()->blockInfo(h), client()->transactionHashes(h));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-int WebThreeStubServerBase::eth_register(std::string const& _address)
+Json::Value WebThreeStubServerBase::eth_getTransactionByHash(string const& _transactionHash)
 {
-	return m_accounts->addProxyAccount(jsToAddress(_address));
+	try
+	{
+		return toJson(client()->transaction(jsToFixed<32>(_transactionHash)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-bool WebThreeStubServerBase::eth_unregister(int _id)
+Json::Value WebThreeStubServerBase::eth_getTransactionByBlockHashAndIndex(string const& _blockHash, string const& _transactionIndex)
 {
-	return m_accounts->removeProxyAccount(_id);
+	try
+	{
+		return toJson(client()->transaction(jsToFixed<32>(_blockHash), jsToInt(_transactionIndex)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-Json::Value WebThreeStubServerBase::eth_queuedTransactions(int _id)
+Json::Value WebThreeStubServerBase::eth_getTransactionByBlockNumberAndIndex(string const& _blockNumber, string const& _transactionIndex)
 {
-	Json::Value ret(Json::arrayValue);
-	for (TransactionSkeleton const& t: m_accounts->getQueuedTransactions(_id))
-		ret.append(toJson(t));
-	m_accounts->clearQueue(_id);
-	return ret;
+	try
+	{
+		return toJson(client()->transaction(client()->hashFromNumber(jsToInt(_blockNumber)), jsToInt(_transactionIndex)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-std::string WebThreeStubServerBase::shh_newGroup(std::string const& _id, std::string const& _who)
+Json::Value WebThreeStubServerBase::eth_getUncleByBlockHashAndIndex(string const& _blockHash, string const& _uncleIndex)
 {
-	(void)_id;
-	(void)_who;
-	return "";
+	try
+	{
+		return toJson(client()->uncle(jsToFixed<32>(_blockHash), jsToInt(_uncleIndex)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-std::string WebThreeStubServerBase::shh_newIdentity()
+Json::Value WebThreeStubServerBase::eth_getUncleByBlockNumberAndIndex(string const& _blockNumber, string const& _uncleIndex)
 {
-//	cnote << this << m_ids;
-	KeyPair kp = KeyPair::create();
-	m_ids[kp.pub()] = kp.secret();
-	return toJS(kp.pub());
+	try
+	{
+		return toJson(client()->uncle(client()->hashFromNumber(toBlockNumber(_blockNumber)), jsToInt(_uncleIndex)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-Json::Value WebThreeStubServerBase::eth_compilers()
+Json::Value WebThreeStubServerBase::eth_getCompilers()
 {
 	Json::Value ret(Json::arrayValue);
 	ret.append("lll");
@@ -511,8 +590,10 @@ Json::Value WebThreeStubServerBase::eth_compilers()
 	return ret;
 }
 
-std::string WebThreeStubServerBase::eth_lll(std::string const& _code)
+
+string WebThreeStubServerBase::eth_compileLLL(string const& _code)
 {
+	// TODO throw here jsonrpc errors
 	string res;
 	vector<string> errors;
 	res = toJS(dev::eth::compileLLL(_code, true, &errors));
@@ -520,8 +601,9 @@ std::string WebThreeStubServerBase::eth_lll(std::string const& _code)
 	return res;
 }
 
-std::string WebThreeStubServerBase::eth_serpent(std::string const& _code)
+string WebThreeStubServerBase::eth_compileSerpent(string const& _code)
 {
+	// TODO throw here jsonrpc errors
 	string res;
 #ifndef _MSC_VER
 	try
@@ -530,7 +612,7 @@ std::string WebThreeStubServerBase::eth_serpent(std::string const& _code)
 	}
 	catch (string err)
 	{
-		cwarn << "Solidity compilation error: " << err;
+		cwarn << "Serpent compilation error: " << err;
 	}
 	catch (...)
 	{
@@ -540,8 +622,9 @@ std::string WebThreeStubServerBase::eth_serpent(std::string const& _code)
 	return res;
 }
 
-std::string WebThreeStubServerBase::eth_solidity(std::string const& _code)
+string WebThreeStubServerBase::eth_compileSolidity(string const& _code)
 {
+	// TOOD throw here jsonrpc errors
 	string res;
 	dev::solidity::CompilerStack compiler;
 	try
@@ -561,204 +644,321 @@ std::string WebThreeStubServerBase::eth_solidity(std::string const& _code)
 	return res;
 }
 
-int WebThreeStubServerBase::eth_number()
+string WebThreeStubServerBase::eth_newFilter(Json::Value const& _json)
 {
-	return client()->number();
+	try
+	{
+		return toJS(client()->installWatch(toLogFilter(_json)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-int WebThreeStubServerBase::eth_peerCount()
+string WebThreeStubServerBase::eth_newBlockFilter(string const& _filter)
 {
-	return network()->peerCount();
+	h256 filter;
+	
+	if (_filter.compare("chain") == 0 || _filter.compare("latest") == 0)
+		filter = dev::eth::ChainChangedFilter;
+	else if (_filter.compare("pending") == 0)
+		filter = dev::eth::PendingChangedFilter;
+	else
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	
+	return toJS(client()->installWatch(filter));
 }
 
-bool WebThreeStubServerBase::shh_post(Json::Value const& _json)
+bool WebThreeStubServerBase::eth_uninstallFilter(string const& _filterId)
 {
-	shh::Message m = toMessage(_json);
-	Secret from;
-
-	if (m.from() && m_ids.count(m.from()))
+	try
 	{
-		cwarn << "Silently signing message from identity" << m.from().abridged() << ": User validation hook goes here.";
-		// TODO: insert validification hook here.
-		from = m_ids[m.from()];
+		return client()->uninstallWatch(jsToInt(_filterId));
 	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
+	
 
-	face()->inject(toSealed(_json, m, from));
-	return true;
 }
 
-bool WebThreeStubServerBase::db_put(std::string const& _name, std::string const& _key, std::string const& _value)
+Json::Value WebThreeStubServerBase::eth_getFilterChanges(string const& _filterId)
 {
-	string v = asString(jsToBytes(_value));
-	db()->put(_name, _key, v);
-	return true;
+	try
+	{
+		int id = jsToInt(_filterId);
+		auto entries = client()->checkWatch(id);
+		if (entries.size())
+			cnote << "FIRING WATCH" << id << entries.size();
+		return toJson(entries);
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-bool WebThreeStubServerBase::db_putString(std::string const& _name, std::string const& _key, std::string const& _value)
+Json::Value WebThreeStubServerBase::eth_getFilterLogs(string const& _filterId)
 {
-	db()->put(_name, _key,_value);
-	return true;
+	try
+	{
+		return toJson(client()->logs(jsToInt(_filterId)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-bool WebThreeStubServerBase::eth_setCoinbase(std::string const& _address)
+Json::Value WebThreeStubServerBase::eth_getLogs(Json::Value const& _json)
 {
-	client()->setAddress(jsToAddress(_address));
-	return true;
+	try
+	{
+		return toJson(client()->logs(toLogFilter(_json)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-bool WebThreeStubServerBase::eth_setDefaultBlock(int _block)
+Json::Value WebThreeStubServerBase::eth_getWork()
 {
-	client()->setDefault(_block);
-	return true;
+	Json::Value ret(Json::arrayValue);
+	auto r = client()->getWork();
+	ret.append(toJS(r.first));
+	ret.append(toJS(r.second));
+	return ret;
 }
 
-bool WebThreeStubServerBase::eth_setListening(bool _listening)
+bool WebThreeStubServerBase::eth_submitWork(string const& _nonce, string const& _mixHash)
 {
-	if (_listening)
-		network()->startNetwork();
-	else
-		network()->stopNetwork();
-	return true;
+	try
+	{
+		return client()->submitWork(ProofOfWork::Proof{jsToFixed<Nonce::size>(_nonce), jsToFixed<32>(_mixHash)});
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-bool WebThreeStubServerBase::eth_setMining(bool _mining)
+string WebThreeStubServerBase::eth_register(string const& _address)
 {
-	if (_mining)
-		client()->startMining();
-	else
-		client()->stopMining();
-	return true;
+	try
+	{
+		return toJS(m_accounts->addProxyAccount(jsToAddress(_address)));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-Json::Value WebThreeStubServerBase::shh_changed(int _id)
+bool WebThreeStubServerBase::eth_unregister(string const& _accountId)
 {
-	Json::Value ret(Json::arrayValue);
-	auto pub = m_shhWatches[_id];
-	if (!pub || m_ids.count(pub))
-		for (h256 const& h: face()->checkWatch(_id))
-		{
-			auto e = face()->envelope(h);
-			shh::Message m;
-			if (pub)
-			{
-				cwarn << "Silently decrypting message from identity" << pub.abridged() << ": User validation hook goes here.";
-				m = e.open(face()->fullTopic(_id), m_ids[pub]);
-			}
-			else
-				m = e.open(face()->fullTopic(_id));
-			if (!m)
-				continue;
-			ret.append(toJson(h, e, m));
-		}
-
-	return ret;
+	try
+	{
+		return m_accounts->removeProxyAccount(jsToInt(_accountId));
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-Json::Value WebThreeStubServerBase::shh_getMessages(int _id)
+Json::Value WebThreeStubServerBase::eth_fetchQueuedTransactions(string const& _accountId)
 {
-	Json::Value ret(Json::arrayValue);
-	auto pub = m_shhWatches[_id];
-	if (!pub || m_ids.count(pub))
-		for (h256 const& h: face()->watchMessages(_id))
-		{
-			auto e = face()->envelope(h);
-			shh::Message m;
-			if (pub)
-			{
-				cwarn << "Silently decrypting message from identity" << pub.abridged() << ": User validation hook goes here.";
-				m = e.open(face()->fullTopic(_id), m_ids[pub]);
-			}
-			else
-				m = e.open(face()->fullTopic(_id));
-			if (!m)
-				continue;
-			ret.append(toJson(h, e, m));
-		}
-	return ret;
+	try
+	{
+		auto id = jsToInt(_accountId);
+		Json::Value ret(Json::arrayValue);
+		// TODO: throw an error on no account with given id
+		for (TransactionSkeleton const& t: m_accounts->getQueuedTransactions(id))
+			ret.append(toJson(t));
+		m_accounts->clearQueue(id);
+		return ret;
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-int WebThreeStubServerBase::shh_newFilter(Json::Value const& _json)
+bool WebThreeStubServerBase::db_put(string const& _name, string const& _key, string const& _value)
 {
-	auto w = toWatch(_json);
-	auto ret = face()->installWatch(w.first);
-	m_shhWatches.insert(make_pair(ret, w.second));
-	return ret;
+	db()->put(_name, _key,_value);
+	return true;
 }
 
-bool WebThreeStubServerBase::shh_uninstallFilter(int _id)
+string WebThreeStubServerBase::db_get(string const& _name, string const& _key)
 {
-	face()->uninstallWatch(_id);
-	return true;
+	return db()->get(_name, _key);;
 }
 
-std::string WebThreeStubServerBase::eth_stateAt(string const& _address, string const& _storage)
+bool WebThreeStubServerBase::shh_post(Json::Value const& _json)
 {
-	return toJS(client()->stateAt(jsToAddress(_address), jsToU256(_storage), client()->getDefault()));
+	try
+	{
+		shh::Message m = toMessage(_json);
+		Secret from;
+		if (m.from() && m_ids.count(m.from()))
+		{
+			cwarn << "Silently signing message from identity" << m.from().abridged() << ": User validation hook goes here.";
+			// TODO: insert validification hook here.
+			from = m_ids[m.from()];
+		}
+
+		face()->inject(toSealed(_json, m, from));
+		return true;
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-Json::Value WebThreeStubServerBase::eth_storageAt(string const& _address)
+string WebThreeStubServerBase::shh_newIdentity()
 {
-	return toJson(client()->storageAt(jsToAddress(_address)));
+	KeyPair kp = KeyPair::create();
+	m_ids[kp.pub()] = kp.secret();
+	return toJS(kp.pub());
 }
 
-std::string WebThreeStubServerBase::eth_transact(Json::Value const& _json)
+bool WebThreeStubServerBase::shh_hasIdentity(string const& _identity)
 {
-	std::string ret;
-	TransactionSkeleton t = toTransaction(_json);
-	if (!t.from)
-		t.from = m_accounts->getDefaultTransactAccount();
-	if (t.creation)
-		ret = toJS(right160(sha3(rlpList(t.from, client()->countAt(t.from)))));;
-	if (!t.gasPrice)
-		t.gasPrice = 10 * dev::eth::szabo;		// TODO: should be determined by user somehow.
-	if (!t.gas)
-		t.gas = min<u256>(client()->gasLimitRemaining(), client()->balanceAt(t.from) / t.gasPrice);
+	try
+	{
+		return m_ids.count(jsToPublic(_identity)) > 0;
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
+}
 
-	if (m_accounts->isRealAccount(t.from))
-		authenticate(t, false);
-	else if (m_accounts->isProxyAccount(t.from))
-		authenticate(t, true);
 
-	return ret;
+string WebThreeStubServerBase::shh_newGroup(string const& _id, string const& _who)
+{
+	(void)_id;
+	(void)_who;
+	return "";
 }
 
-void WebThreeStubServerBase::authenticate(TransactionSkeleton const& _t, bool _toProxy)
+string WebThreeStubServerBase::shh_addToGroup(string const& _group, string const& _who)
 {
-	if (_toProxy)
-		m_accounts->queueTransaction(_t);
-	else if (_t.to)
-		client()->transact(m_accounts->secretKey(_t.from), _t.value, _t.to, _t.data, _t.gas, _t.gasPrice);
-	else
-		client()->transact(m_accounts->secretKey(_t.from), _t.value, _t.data, _t.gas, _t.gasPrice);
+	(void)_group;
+	(void)_who;
+	return "";
 }
 
-Json::Value WebThreeStubServerBase::eth_transactionByHash(std::string const& _hash, int _i)
+string WebThreeStubServerBase::shh_newFilter(Json::Value const& _json)
 {
-	return toJson(client()->transaction(jsToFixed<32>(_hash), _i));
+	
+	try
+	{
+		pair<shh::FullTopic, Public> w = toWatch(_json);
+		auto ret = face()->installWatch(w.first);
+		m_shhWatches.insert(make_pair(ret, w.second));
+		return toJS(ret);
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-Json::Value WebThreeStubServerBase::eth_transactionByNumber(int _number, int _i)
+bool WebThreeStubServerBase::shh_uninstallFilter(string const& _filterId)
 {
-	return toJson(client()->transaction(client()->hashFromNumber(_number), _i));
+	try
+	{
+		face()->uninstallWatch(jsToInt(_filterId));
+		return true;
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-Json::Value WebThreeStubServerBase::eth_uncleByHash(std::string const& _hash, int _i)
+Json::Value WebThreeStubServerBase::shh_getFilterChanges(string const& _filterId)
 {
-	return toJson(client()->uncle(jsToFixed<32>(_hash), _i));
+	try
+	{
+		Json::Value ret(Json::arrayValue);
+
+		int id = jsToInt(_filterId);
+		auto pub = m_shhWatches[id];
+		if (!pub || m_ids.count(pub))
+			for (h256 const& h: face()->checkWatch(id))
+			{
+				auto e = face()->envelope(h);
+				shh::Message m;
+				if (pub)
+				{
+					cwarn << "Silently decrypting message from identity" << pub.abridged() << ": User validation hook goes here.";
+					m = e.open(face()->fullTopic(id), m_ids[pub]);
+				}
+				else
+					m = e.open(face()->fullTopic(id));
+				if (!m)
+					continue;
+				ret.append(toJson(h, e, m));
+			}
+
+		return ret;
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-Json::Value WebThreeStubServerBase::eth_uncleByNumber(int _number, int _i)
+Json::Value WebThreeStubServerBase::shh_getMessages(string const& _filterId)
 {
-	return toJson(client()->uncle(client()->hashFromNumber(_number), _i));
+	try
+	{
+		Json::Value ret(Json::arrayValue);
+
+		int id = jsToInt(_filterId);
+		auto pub = m_shhWatches[id];
+		if (!pub || m_ids.count(pub))
+			for (h256 const& h: face()->watchMessages(id))
+			{
+				auto e = face()->envelope(h);
+				shh::Message m;
+				if (pub)
+				{
+					cwarn << "Silently decrypting message from identity" << pub.abridged() << ": User validation hook goes here.";
+					m = e.open(face()->fullTopic(id), m_ids[pub]);
+				}
+				else
+					m = e.open(face()->fullTopic(id));
+				if (!m)
+					continue;
+				ret.append(toJson(h, e, m));
+			}
+		return ret;
+	}
+	catch (...)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INVALID_PARAMS));
+	}
 }
 
-bool WebThreeStubServerBase::eth_uninstallFilter(int _id)
+void WebThreeStubServerBase::authenticate(TransactionSkeleton const& _t, bool _toProxy)
 {
-	client()->uninstallWatch(_id);
-	return true;
+	if (_toProxy)
+		m_accounts->queueTransaction(_t);
+	else if (_t.to)
+		client()->transact(m_accounts->secretKey(_t.from), _t.value, _t.to, _t.data, _t.gas, _t.gasPrice);
+	else
+		client()->transact(m_accounts->secretKey(_t.from), _t.value, _t.data, _t.gas, _t.gasPrice);
 }
 
-void WebThreeStubServerBase::setAccounts(const std::vector<KeyPair>& _accounts)
+void WebThreeStubServerBase::setAccounts(const vector<KeyPair>& _accounts)
 {
 	m_accounts->setAccounts(_accounts);
 }
diff --git a/libweb3jsonrpc/WebThreeStubServerBase.h b/libweb3jsonrpc/WebThreeStubServerBase.h
index 993c82c5c..214573e0d 100644
--- a/libweb3jsonrpc/WebThreeStubServerBase.h
+++ b/libweb3jsonrpc/WebThreeStubServerBase.h
@@ -68,69 +68,64 @@ public:
 	WebThreeStubServerBase(jsonrpc::AbstractServerConnector& _conn, std::vector<dev::KeyPair> const& _accounts);
 
 	virtual std::string web3_sha3(std::string const& _param1);
-	virtual Json::Value eth_accounts();
-	virtual std::string eth_balanceAt(std::string const& _address);
-	virtual Json::Value eth_blockByHash(std::string const& _hash);
-	virtual Json::Value eth_blockByNumber(int _number);
-	virtual std::string eth_call(Json::Value const& _json);
-	virtual Json::Value eth_changed(int _id);
-	virtual std::string eth_codeAt(std::string const& _address);
+	virtual std::string web3_clientVersion() { return "C++ (ethereum-cpp)"; }
+
+	virtual std::string net_version() { return ""; }
+	virtual std::string net_peerCount();
+	virtual bool net_listening();
+
 	virtual std::string eth_coinbase();
-	virtual Json::Value eth_compilers();
-	virtual double eth_countAt(std::string const& _address);
-	virtual double eth_transactionCountByHash(std::string const& _hash);
-	virtual double eth_transactionCountByNumber(int _number);
-	virtual double eth_uncleCountByHash(std::string const& _hash);
-	virtual double eth_uncleCountByNumber(int _number);
-	virtual int eth_defaultBlock();
+	virtual bool eth_mining();
 	virtual std::string eth_gasPrice();
-	virtual Json::Value eth_filterLogs(int _id);
+	virtual Json::Value eth_accounts();
+	virtual std::string eth_blockNumber();
+	virtual std::string eth_getBalance(std::string const& _address, std::string const& _blockNumber);
+	virtual std::string eth_getStorageAt(std::string const& _address, std::string const& _position, std::string const& _blockNumber);
+	virtual std::string eth_getTransactionCount(std::string const& _address, std::string const& _blockNumber);
+	virtual std::string eth_getBlockTransactionCountByHash(std::string const& _blockHash);
+	virtual std::string eth_getBlockTransactionCountByNumber(std::string const& _blockNumber);
+	virtual std::string eth_getUncleCountByBlockHash(std::string const& _blockHash);
+	virtual std::string eth_getUncleCountByBlockNumber(std::string const& _blockNumber);
+	virtual std::string eth_getCode(std::string const& _address, std::string const& _blockNumber);
+	virtual std::string eth_sendTransaction(Json::Value const& _json);
+	virtual std::string eth_call(Json::Value const& _json, std::string const& _blockNumber);
 	virtual bool eth_flush();
-	virtual Json::Value eth_logs(Json::Value const& _json);
-	virtual bool eth_listening();
-	virtual bool eth_mining();
-	virtual int eth_newFilter(Json::Value const& _json);
-	virtual int eth_newFilterString(std::string const& _filter);
-	virtual int eth_number();
-	virtual int eth_peerCount();
-	virtual bool eth_setCoinbase(std::string const& _address);
-	virtual bool eth_setDefaultBlock(int _block);
-	virtual bool eth_setListening(bool _listening);
-	virtual std::string eth_lll(std::string const& _s);
-	virtual std::string eth_serpent(std::string const& _s);
-	virtual bool eth_setMining(bool _mining);
-	virtual std::string eth_solidity(std::string const& _code);
-	virtual std::string eth_stateAt(std::string const& _address, std::string const& _storage);
-	virtual Json::Value eth_storageAt(std::string const& _address);
-	virtual std::string eth_transact(Json::Value const& _json);
-	virtual Json::Value eth_transactionByHash(std::string const& _hash, int _i);
-	virtual Json::Value eth_transactionByNumber(int  _number, int _i);
-	virtual Json::Value eth_uncleByHash(std::string const& _hash, int _i);
-	virtual Json::Value eth_uncleByNumber(int _number, int _i);
-	virtual bool eth_uninstallFilter(int _id);
-
+	virtual Json::Value eth_getBlockByHash(std::string const& _blockHash, bool _includeTransactions);
+	virtual Json::Value eth_getBlockByNumber(std::string const& _blockNumber, bool _includeTransactions);
+	virtual Json::Value eth_getTransactionByHash(std::string const& _transactionHash);
+	virtual Json::Value eth_getTransactionByBlockHashAndIndex(std::string const& _blockHash, std::string const& _transactionIndex);
+	virtual Json::Value eth_getTransactionByBlockNumberAndIndex(std::string const& _blockNumber, std::string const& _transactionIndex);
+	virtual Json::Value eth_getUncleByBlockHashAndIndex(std::string const& _blockHash, std::string const& _uncleIndex);
+	virtual Json::Value eth_getUncleByBlockNumberAndIndex(std::string const& _blockNumber, std::string const& _uncleIndex);
+	virtual Json::Value eth_getCompilers();
+	virtual std::string eth_compileLLL(std::string const& _s);
+	virtual std::string eth_compileSerpent(std::string const& _s);
+	virtual std::string eth_compileSolidity(std::string const& _code);
+	virtual std::string eth_newFilter(Json::Value const& _json);
+	virtual std::string eth_newBlockFilter(std::string const& _filter);
+	virtual bool eth_uninstallFilter(std::string const& _filterId);
+	virtual Json::Value eth_getFilterChanges(std::string const& _filterId);
+	virtual Json::Value eth_getFilterLogs(std::string const& _filterId);
+	virtual Json::Value eth_getLogs(Json::Value const& _json);
 	virtual Json::Value eth_getWork();
 	virtual bool eth_submitWork(std::string const& _nonce, std::string const& _mixHash);
-
-	virtual int eth_register(std::string const& _address);
-	virtual bool eth_unregister(int _id);
-	virtual Json::Value eth_queuedTransactions(int _id);
-
-	virtual std::string db_get(std::string const& _name, std::string const& _key);
-	virtual std::string db_getString(std::string const& _name, std::string const& _key);
+	virtual std::string eth_register(std::string const& _address);
+	virtual bool eth_unregister(std::string const& _accountId);
+	virtual Json::Value eth_fetchQueuedTransactions(std::string const& _accountId);
+	
 	virtual bool db_put(std::string const& _name, std::string const& _key, std::string const& _value);
-	virtual bool db_putString(std::string const& _name, std::string const& _key, std::string const& _value);
+	virtual std::string db_get(std::string const& _name, std::string const& _key);
 
-	virtual std::string shh_addToGroup(std::string const& _group, std::string const& _who);
-	virtual Json::Value shh_changed(int _id);
-	virtual Json::Value shh_getMessages(int _id);
-	virtual bool shh_haveIdentity(std::string const& _id);
-	virtual int shh_newFilter(Json::Value const& _json);
-	virtual std::string shh_newGroup(std::string const& _id, std::string const& _who);
-	virtual std::string shh_newIdentity();
 	virtual bool shh_post(Json::Value const& _json);
-	virtual bool shh_uninstallFilter(int _id);
-
+	virtual std::string shh_newIdentity();
+	virtual bool shh_hasIdentity(std::string const& _identity);
+	virtual std::string shh_newGroup(std::string const& _id, std::string const& _who);
+	virtual std::string shh_addToGroup(std::string const& _group, std::string const& _who);
+	virtual std::string shh_newFilter(Json::Value const& _json);
+	virtual bool shh_uninstallFilter(std::string const& _filterId);
+	virtual Json::Value shh_getFilterChanges(std::string const& _filterId);
+	virtual Json::Value shh_getMessages(std::string const& _filterId);
+	
 	void setAccounts(std::vector<dev::KeyPair> const& _accounts);
 	void setIdentities(std::vector<dev::KeyPair> const& _ids);
 	std::map<dev::Public, dev::Secret> const& ids() const { return m_ids; }
diff --git a/libweb3jsonrpc/abstractwebthreestubserver.h b/libweb3jsonrpc/abstractwebthreestubserver.h
index bb84afc9b..516817d5c 100644
--- a/libweb3jsonrpc/abstractwebthreestubserver.h
+++ b/libweb3jsonrpc/abstractwebthreestubserver.h
@@ -13,96 +13,94 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         AbstractWebThreeStubServer(jsonrpc::AbstractServerConnector &conn, jsonrpc::serverVersion_t type = jsonrpc::JSONRPC_SERVER_V2) : jsonrpc::AbstractServer<AbstractWebThreeStubServer>(conn, type)
         {
             this->bindAndAddMethod(jsonrpc::Procedure("web3_sha3", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::web3_sha3I);
+            this->bindAndAddMethod(jsonrpc::Procedure("web3_clientVersion", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING,  NULL), &AbstractWebThreeStubServer::web3_clientVersionI);
+            this->bindAndAddMethod(jsonrpc::Procedure("net_version", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING,  NULL), &AbstractWebThreeStubServer::net_versionI);
+            this->bindAndAddMethod(jsonrpc::Procedure("net_peerCount", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING,  NULL), &AbstractWebThreeStubServer::net_peerCountI);
+            this->bindAndAddMethod(jsonrpc::Procedure("net_listening", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN,  NULL), &AbstractWebThreeStubServer::net_listeningI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_coinbase", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING,  NULL), &AbstractWebThreeStubServer::eth_coinbaseI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_setCoinbase", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_setCoinbaseI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_listening", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN,  NULL), &AbstractWebThreeStubServer::eth_listeningI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_setListening", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_BOOLEAN, NULL), &AbstractWebThreeStubServer::eth_setListeningI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_mining", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN,  NULL), &AbstractWebThreeStubServer::eth_miningI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_setMining", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_BOOLEAN, NULL), &AbstractWebThreeStubServer::eth_setMiningI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_gasPrice", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING,  NULL), &AbstractWebThreeStubServer::eth_gasPriceI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_accounts", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY,  NULL), &AbstractWebThreeStubServer::eth_accountsI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_peerCount", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_INTEGER,  NULL), &AbstractWebThreeStubServer::eth_peerCountI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_defaultBlock", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_INTEGER,  NULL), &AbstractWebThreeStubServer::eth_defaultBlockI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_setDefaultBlock", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_setDefaultBlockI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_number", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_INTEGER,  NULL), &AbstractWebThreeStubServer::eth_numberI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_balanceAt", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_balanceAtI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_stateAt", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_stateAtI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_storageAt", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_storageAtI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_countAt", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_REAL, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_countAtI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_transactionCountByHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_REAL, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_transactionCountByHashI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_transactionCountByNumber", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_REAL, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_transactionCountByNumberI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_uncleCountByHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_REAL, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_uncleCountByHashI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_uncleCountByNumber", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_REAL, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_uncleCountByNumberI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_codeAt", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_codeAtI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_transact", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::eth_transactI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_call", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::eth_callI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_blockNumber", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING,  NULL), &AbstractWebThreeStubServer::eth_blockNumberI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getBalance", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getBalanceI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getStorageAt", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING,"param3",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getStorageAtI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getTransactionCount", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getTransactionCountI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getBlockTransactionCountByHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getBlockTransactionCountByHashI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getBlockTransactionCountByNumber", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getBlockTransactionCountByNumberI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getUncleCountByBlockHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getUncleCountByBlockHashI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getUncleCountByBlockNumber", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getUncleCountByBlockNumberI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getCode", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getCodeI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_sendTransaction", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::eth_sendTransactionI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_call", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_OBJECT,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_callI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_flush", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN,  NULL), &AbstractWebThreeStubServer::eth_flushI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_blockByHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_blockByHashI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_blockByNumber", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_blockByNumberI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_transactionByHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_transactionByHashI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_transactionByNumber", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_INTEGER,"param2",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_transactionByNumberI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_uncleByHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_uncleByHashI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_uncleByNumber", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_INTEGER,"param2",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_uncleByNumberI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_compilers", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY,  NULL), &AbstractWebThreeStubServer::eth_compilersI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_lll", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_lllI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_solidity", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_solidityI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_serpent", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_serpentI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_newFilter", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_INTEGER, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::eth_newFilterI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_newFilterString", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_INTEGER, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_newFilterStringI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_uninstallFilter", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_uninstallFilterI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_changed", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_changedI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_filterLogs", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_filterLogsI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_logs", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::eth_logsI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getBlockByHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_BOOLEAN, NULL), &AbstractWebThreeStubServer::eth_getBlockByHashI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getBlockByNumber", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_BOOLEAN, NULL), &AbstractWebThreeStubServer::eth_getBlockByNumberI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getTransactionByHash", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getTransactionByHashI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getTransactionByBlockHashAndIndex", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getTransactionByBlockHashAndIndexI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getTransactionByBlockNumberAndIndex", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getTransactionByBlockNumberAndIndexI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getUncleByBlockHashAndIndex", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getUncleByBlockHashAndIndexI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getUncleByBlockNumberAndIndex", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_OBJECT, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getUncleByBlockNumberAndIndexI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getCompilers", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY,  NULL), &AbstractWebThreeStubServer::eth_getCompilersI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_compileLLL", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_compileLLLI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_compileSerpent", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_compileSerpentI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_compileSolidity", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_compileSolidityI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_newFilter", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::eth_newFilterI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_newBlockFilter", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_newBlockFilterI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_uninstallFilter", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_uninstallFilterI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getFilterChanges", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getFilterChangesI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getFilterLogs", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_getFilterLogsI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_getLogs", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::eth_getLogsI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_getWork", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY,  NULL), &AbstractWebThreeStubServer::eth_getWorkI);
             this->bindAndAddMethod(jsonrpc::Procedure("eth_submitWork", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_submitWorkI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_register", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_INTEGER, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_registerI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_unregister", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_unregisterI);
-            this->bindAndAddMethod(jsonrpc::Procedure("eth_queuedTransactions", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_queuedTransactionsI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_register", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_registerI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_unregister", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_unregisterI);
+            this->bindAndAddMethod(jsonrpc::Procedure("eth_fetchQueuedTransactions", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_fetchQueuedTransactionsI);
             this->bindAndAddMethod(jsonrpc::Procedure("db_put", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING,"param3",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::db_putI);
             this->bindAndAddMethod(jsonrpc::Procedure("db_get", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::db_getI);
-            this->bindAndAddMethod(jsonrpc::Procedure("db_putString", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING,"param3",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::db_putStringI);
-            this->bindAndAddMethod(jsonrpc::Procedure("db_getString", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::db_getStringI);
             this->bindAndAddMethod(jsonrpc::Procedure("shh_post", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::shh_postI);
             this->bindAndAddMethod(jsonrpc::Procedure("shh_newIdentity", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING,  NULL), &AbstractWebThreeStubServer::shh_newIdentityI);
-            this->bindAndAddMethod(jsonrpc::Procedure("shh_haveIdentity", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::shh_haveIdentityI);
+            this->bindAndAddMethod(jsonrpc::Procedure("shh_hasIdentity", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::shh_hasIdentityI);
             this->bindAndAddMethod(jsonrpc::Procedure("shh_newGroup", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::shh_newGroupI);
             this->bindAndAddMethod(jsonrpc::Procedure("shh_addToGroup", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::shh_addToGroupI);
-            this->bindAndAddMethod(jsonrpc::Procedure("shh_newFilter", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_INTEGER, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::shh_newFilterI);
-            this->bindAndAddMethod(jsonrpc::Procedure("shh_uninstallFilter", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::shh_uninstallFilterI);
-            this->bindAndAddMethod(jsonrpc::Procedure("shh_changed", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::shh_changedI);
-            this->bindAndAddMethod(jsonrpc::Procedure("shh_getMessages", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::shh_getMessagesI);
+            this->bindAndAddMethod(jsonrpc::Procedure("shh_newFilter", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::shh_newFilterI);
+            this->bindAndAddMethod(jsonrpc::Procedure("shh_uninstallFilter", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::shh_uninstallFilterI);
+            this->bindAndAddMethod(jsonrpc::Procedure("shh_getFilterChanges", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::shh_getFilterChangesI);
+            this->bindAndAddMethod(jsonrpc::Procedure("shh_getMessages", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::shh_getMessagesI);
         }
 
         inline virtual void web3_sha3I(const Json::Value &request, Json::Value &response)
         {
             response = this->web3_sha3(request[0u].asString());
         }
-        inline virtual void eth_coinbaseI(const Json::Value &request, Json::Value &response)
+        inline virtual void web3_clientVersionI(const Json::Value &request, Json::Value &response)
         {
             (void)request;
-            response = this->eth_coinbase();
+            response = this->web3_clientVersion();
         }
-        inline virtual void eth_setCoinbaseI(const Json::Value &request, Json::Value &response)
+        inline virtual void net_versionI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_setCoinbase(request[0u].asString());
+            (void)request;
+            response = this->net_version();
         }
-        inline virtual void eth_listeningI(const Json::Value &request, Json::Value &response)
+        inline virtual void net_peerCountI(const Json::Value &request, Json::Value &response)
         {
             (void)request;
-            response = this->eth_listening();
+            response = this->net_peerCount();
         }
-        inline virtual void eth_setListeningI(const Json::Value &request, Json::Value &response)
+        inline virtual void net_listeningI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_setListening(request[0u].asBool());
+            (void)request;
+            response = this->net_listening();
         }
-        inline virtual void eth_miningI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_coinbaseI(const Json::Value &request, Json::Value &response)
         {
             (void)request;
-            response = this->eth_mining();
+            response = this->eth_coinbase();
         }
-        inline virtual void eth_setMiningI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_miningI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_setMining(request[0u].asBool());
+            (void)request;
+            response = this->eth_mining();
         }
         inline virtual void eth_gasPriceI(const Json::Value &request, Json::Value &response)
         {
@@ -114,138 +112,124 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
             (void)request;
             response = this->eth_accounts();
         }
-        inline virtual void eth_peerCountI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_blockNumberI(const Json::Value &request, Json::Value &response)
         {
             (void)request;
-            response = this->eth_peerCount();
+            response = this->eth_blockNumber();
         }
-        inline virtual void eth_defaultBlockI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getBalanceI(const Json::Value &request, Json::Value &response)
         {
-            (void)request;
-            response = this->eth_defaultBlock();
+            response = this->eth_getBalance(request[0u].asString(), request[1u].asString());
         }
-        inline virtual void eth_setDefaultBlockI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getStorageAtI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_setDefaultBlock(request[0u].asInt());
+            response = this->eth_getStorageAt(request[0u].asString(), request[1u].asString(), request[2u].asString());
         }
-        inline virtual void eth_numberI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getTransactionCountI(const Json::Value &request, Json::Value &response)
         {
-            (void)request;
-            response = this->eth_number();
+            response = this->eth_getTransactionCount(request[0u].asString(), request[1u].asString());
         }
-        inline virtual void eth_balanceAtI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getBlockTransactionCountByHashI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_balanceAt(request[0u].asString());
+            response = this->eth_getBlockTransactionCountByHash(request[0u].asString());
         }
-        inline virtual void eth_stateAtI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getBlockTransactionCountByNumberI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_stateAt(request[0u].asString(), request[1u].asString());
+            response = this->eth_getBlockTransactionCountByNumber(request[0u].asString());
         }
-        inline virtual void eth_storageAtI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getUncleCountByBlockHashI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_storageAt(request[0u].asString());
+            response = this->eth_getUncleCountByBlockHash(request[0u].asString());
         }
-        inline virtual void eth_countAtI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getUncleCountByBlockNumberI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_countAt(request[0u].asString());
+            response = this->eth_getUncleCountByBlockNumber(request[0u].asString());
         }
-        inline virtual void eth_transactionCountByHashI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getCodeI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_transactionCountByHash(request[0u].asString());
+            response = this->eth_getCode(request[0u].asString(), request[1u].asString());
         }
-        inline virtual void eth_transactionCountByNumberI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_sendTransactionI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_transactionCountByNumber(request[0u].asInt());
-        }
-        inline virtual void eth_uncleCountByHashI(const Json::Value &request, Json::Value &response)
-        {
-            response = this->eth_uncleCountByHash(request[0u].asString());
-        }
-        inline virtual void eth_uncleCountByNumberI(const Json::Value &request, Json::Value &response)
-        {
-            response = this->eth_uncleCountByNumber(request[0u].asInt());
-        }
-        inline virtual void eth_codeAtI(const Json::Value &request, Json::Value &response)
-        {
-            response = this->eth_codeAt(request[0u].asString());
-        }
-        inline virtual void eth_transactI(const Json::Value &request, Json::Value &response)
-        {
-            response = this->eth_transact(request[0u]);
+            response = this->eth_sendTransaction(request[0u]);
         }
         inline virtual void eth_callI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_call(request[0u]);
+            response = this->eth_call(request[0u], request[1u].asString());
         }
         inline virtual void eth_flushI(const Json::Value &request, Json::Value &response)
         {
             (void)request;
             response = this->eth_flush();
         }
-        inline virtual void eth_blockByHashI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getBlockByHashI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_blockByHash(request[0u].asString());
+            response = this->eth_getBlockByHash(request[0u].asString(), request[1u].asBool());
         }
-        inline virtual void eth_blockByNumberI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getBlockByNumberI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_blockByNumber(request[0u].asInt());
+            response = this->eth_getBlockByNumber(request[0u].asString(), request[1u].asBool());
         }
-        inline virtual void eth_transactionByHashI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getTransactionByHashI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_transactionByHash(request[0u].asString(), request[1u].asInt());
+            response = this->eth_getTransactionByHash(request[0u].asString());
         }
-        inline virtual void eth_transactionByNumberI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getTransactionByBlockHashAndIndexI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_transactionByNumber(request[0u].asInt(), request[1u].asInt());
+            response = this->eth_getTransactionByBlockHashAndIndex(request[0u].asString(), request[1u].asString());
         }
-        inline virtual void eth_uncleByHashI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getTransactionByBlockNumberAndIndexI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_uncleByHash(request[0u].asString(), request[1u].asInt());
+            response = this->eth_getTransactionByBlockNumberAndIndex(request[0u].asString(), request[1u].asString());
         }
-        inline virtual void eth_uncleByNumberI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getUncleByBlockHashAndIndexI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_uncleByNumber(request[0u].asInt(), request[1u].asInt());
+            response = this->eth_getUncleByBlockHashAndIndex(request[0u].asString(), request[1u].asString());
         }
-        inline virtual void eth_compilersI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getUncleByBlockNumberAndIndexI(const Json::Value &request, Json::Value &response)
+        {
+            response = this->eth_getUncleByBlockNumberAndIndex(request[0u].asString(), request[1u].asString());
+        }
+        inline virtual void eth_getCompilersI(const Json::Value &request, Json::Value &response)
         {
             (void)request;
-            response = this->eth_compilers();
+            response = this->eth_getCompilers();
         }
-        inline virtual void eth_lllI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_compileLLLI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_lll(request[0u].asString());
+            response = this->eth_compileLLL(request[0u].asString());
         }
-        inline virtual void eth_solidityI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_compileSerpentI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_solidity(request[0u].asString());
+            response = this->eth_compileSerpent(request[0u].asString());
         }
-        inline virtual void eth_serpentI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_compileSolidityI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_serpent(request[0u].asString());
+            response = this->eth_compileSolidity(request[0u].asString());
         }
         inline virtual void eth_newFilterI(const Json::Value &request, Json::Value &response)
         {
             response = this->eth_newFilter(request[0u]);
         }
-        inline virtual void eth_newFilterStringI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_newBlockFilterI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_newFilterString(request[0u].asString());
+            response = this->eth_newBlockFilter(request[0u].asString());
         }
         inline virtual void eth_uninstallFilterI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_uninstallFilter(request[0u].asInt());
+            response = this->eth_uninstallFilter(request[0u].asString());
         }
-        inline virtual void eth_changedI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getFilterChangesI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_changed(request[0u].asInt());
+            response = this->eth_getFilterChanges(request[0u].asString());
         }
-        inline virtual void eth_filterLogsI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getFilterLogsI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_filterLogs(request[0u].asInt());
+            response = this->eth_getFilterLogs(request[0u].asString());
         }
-        inline virtual void eth_logsI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_getLogsI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_logs(request[0u]);
+            response = this->eth_getLogs(request[0u]);
         }
         inline virtual void eth_getWorkI(const Json::Value &request, Json::Value &response)
         {
@@ -262,11 +246,11 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         }
         inline virtual void eth_unregisterI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_unregister(request[0u].asInt());
+            response = this->eth_unregister(request[0u].asString());
         }
-        inline virtual void eth_queuedTransactionsI(const Json::Value &request, Json::Value &response)
+        inline virtual void eth_fetchQueuedTransactionsI(const Json::Value &request, Json::Value &response)
         {
-            response = this->eth_queuedTransactions(request[0u].asInt());
+            response = this->eth_fetchQueuedTransactions(request[0u].asString());
         }
         inline virtual void db_putI(const Json::Value &request, Json::Value &response)
         {
@@ -276,14 +260,6 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         {
             response = this->db_get(request[0u].asString(), request[1u].asString());
         }
-        inline virtual void db_putStringI(const Json::Value &request, Json::Value &response)
-        {
-            response = this->db_putString(request[0u].asString(), request[1u].asString(), request[2u].asString());
-        }
-        inline virtual void db_getStringI(const Json::Value &request, Json::Value &response)
-        {
-            response = this->db_getString(request[0u].asString(), request[1u].asString());
-        }
         inline virtual void shh_postI(const Json::Value &request, Json::Value &response)
         {
             response = this->shh_post(request[0u]);
@@ -293,9 +269,9 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
             (void)request;
             response = this->shh_newIdentity();
         }
-        inline virtual void shh_haveIdentityI(const Json::Value &request, Json::Value &response)
+        inline virtual void shh_hasIdentityI(const Json::Value &request, Json::Value &response)
         {
-            response = this->shh_haveIdentity(request[0u].asString());
+            response = this->shh_hasIdentity(request[0u].asString());
         }
         inline virtual void shh_newGroupI(const Json::Value &request, Json::Value &response)
         {
@@ -311,75 +287,70 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         }
         inline virtual void shh_uninstallFilterI(const Json::Value &request, Json::Value &response)
         {
-            response = this->shh_uninstallFilter(request[0u].asInt());
+            response = this->shh_uninstallFilter(request[0u].asString());
         }
-        inline virtual void shh_changedI(const Json::Value &request, Json::Value &response)
+        inline virtual void shh_getFilterChangesI(const Json::Value &request, Json::Value &response)
         {
-            response = this->shh_changed(request[0u].asInt());
+            response = this->shh_getFilterChanges(request[0u].asString());
         }
         inline virtual void shh_getMessagesI(const Json::Value &request, Json::Value &response)
         {
-            response = this->shh_getMessages(request[0u].asInt());
+            response = this->shh_getMessages(request[0u].asString());
         }
         virtual std::string web3_sha3(const std::string& param1) = 0;
+        virtual std::string web3_clientVersion() = 0;
+        virtual std::string net_version() = 0;
+        virtual std::string net_peerCount() = 0;
+        virtual bool net_listening() = 0;
         virtual std::string eth_coinbase() = 0;
-        virtual bool eth_setCoinbase(const std::string& param1) = 0;
-        virtual bool eth_listening() = 0;
-        virtual bool eth_setListening(bool param1) = 0;
         virtual bool eth_mining() = 0;
-        virtual bool eth_setMining(bool param1) = 0;
         virtual std::string eth_gasPrice() = 0;
         virtual Json::Value eth_accounts() = 0;
-        virtual int eth_peerCount() = 0;
-        virtual int eth_defaultBlock() = 0;
-        virtual bool eth_setDefaultBlock(int param1) = 0;
-        virtual int eth_number() = 0;
-        virtual std::string eth_balanceAt(const std::string& param1) = 0;
-        virtual std::string eth_stateAt(const std::string& param1, const std::string& param2) = 0;
-        virtual Json::Value eth_storageAt(const std::string& param1) = 0;
-        virtual double eth_countAt(const std::string& param1) = 0;
-        virtual double eth_transactionCountByHash(const std::string& param1) = 0;
-        virtual double eth_transactionCountByNumber(int param1) = 0;
-        virtual double eth_uncleCountByHash(const std::string& param1) = 0;
-        virtual double eth_uncleCountByNumber(int param1) = 0;
-        virtual std::string eth_codeAt(const std::string& param1) = 0;
-        virtual std::string eth_transact(const Json::Value& param1) = 0;
-        virtual std::string eth_call(const Json::Value& param1) = 0;
+        virtual std::string eth_blockNumber() = 0;
+        virtual std::string eth_getBalance(const std::string& param1, const std::string& param2) = 0;
+        virtual std::string eth_getStorageAt(const std::string& param1, const std::string& param2, const std::string& param3) = 0;
+        virtual std::string eth_getTransactionCount(const std::string& param1, const std::string& param2) = 0;
+        virtual std::string eth_getBlockTransactionCountByHash(const std::string& param1) = 0;
+        virtual std::string eth_getBlockTransactionCountByNumber(const std::string& param1) = 0;
+        virtual std::string eth_getUncleCountByBlockHash(const std::string& param1) = 0;
+        virtual std::string eth_getUncleCountByBlockNumber(const std::string& param1) = 0;
+        virtual std::string eth_getCode(const std::string& param1, const std::string& param2) = 0;
+        virtual std::string eth_sendTransaction(const Json::Value& param1) = 0;
+        virtual std::string eth_call(const Json::Value& param1, const std::string& param2) = 0;
         virtual bool eth_flush() = 0;
-        virtual Json::Value eth_blockByHash(const std::string& param1) = 0;
-        virtual Json::Value eth_blockByNumber(int param1) = 0;
-        virtual Json::Value eth_transactionByHash(const std::string& param1, int param2) = 0;
-        virtual Json::Value eth_transactionByNumber(int param1, int param2) = 0;
-        virtual Json::Value eth_uncleByHash(const std::string& param1, int param2) = 0;
-        virtual Json::Value eth_uncleByNumber(int param1, int param2) = 0;
-        virtual Json::Value eth_compilers() = 0;
-        virtual std::string eth_lll(const std::string& param1) = 0;
-        virtual std::string eth_solidity(const std::string& param1) = 0;
-        virtual std::string eth_serpent(const std::string& param1) = 0;
-        virtual int eth_newFilter(const Json::Value& param1) = 0;
-        virtual int eth_newFilterString(const std::string& param1) = 0;
-        virtual bool eth_uninstallFilter(int param1) = 0;
-        virtual Json::Value eth_changed(int param1) = 0;
-        virtual Json::Value eth_filterLogs(int param1) = 0;
-        virtual Json::Value eth_logs(const Json::Value& param1) = 0;
+        virtual Json::Value eth_getBlockByHash(const std::string& param1, bool param2) = 0;
+        virtual Json::Value eth_getBlockByNumber(const std::string& param1, bool param2) = 0;
+        virtual Json::Value eth_getTransactionByHash(const std::string& param1) = 0;
+        virtual Json::Value eth_getTransactionByBlockHashAndIndex(const std::string& param1, const std::string& param2) = 0;
+        virtual Json::Value eth_getTransactionByBlockNumberAndIndex(const std::string& param1, const std::string& param2) = 0;
+        virtual Json::Value eth_getUncleByBlockHashAndIndex(const std::string& param1, const std::string& param2) = 0;
+        virtual Json::Value eth_getUncleByBlockNumberAndIndex(const std::string& param1, const std::string& param2) = 0;
+        virtual Json::Value eth_getCompilers() = 0;
+        virtual std::string eth_compileLLL(const std::string& param1) = 0;
+        virtual std::string eth_compileSerpent(const std::string& param1) = 0;
+        virtual std::string eth_compileSolidity(const std::string& param1) = 0;
+        virtual std::string eth_newFilter(const Json::Value& param1) = 0;
+        virtual std::string eth_newBlockFilter(const std::string& param1) = 0;
+        virtual bool eth_uninstallFilter(const std::string& param1) = 0;
+        virtual Json::Value eth_getFilterChanges(const std::string& param1) = 0;
+        virtual Json::Value eth_getFilterLogs(const std::string& param1) = 0;
+        virtual Json::Value eth_getLogs(const Json::Value& param1) = 0;
         virtual Json::Value eth_getWork() = 0;
         virtual bool eth_submitWork(const std::string& param1, const std::string& param2) = 0;
-        virtual int eth_register(const std::string& param1) = 0;
-        virtual bool eth_unregister(int param1) = 0;
-        virtual Json::Value eth_queuedTransactions(int param1) = 0;
+        virtual std::string eth_register(const std::string& param1) = 0;
+        virtual bool eth_unregister(const std::string& param1) = 0;
+        virtual Json::Value eth_fetchQueuedTransactions(const std::string& param1) = 0;
         virtual bool db_put(const std::string& param1, const std::string& param2, const std::string& param3) = 0;
         virtual std::string db_get(const std::string& param1, const std::string& param2) = 0;
-        virtual bool db_putString(const std::string& param1, const std::string& param2, const std::string& param3) = 0;
-        virtual std::string db_getString(const std::string& param1, const std::string& param2) = 0;
         virtual bool shh_post(const Json::Value& param1) = 0;
         virtual std::string shh_newIdentity() = 0;
-        virtual bool shh_haveIdentity(const std::string& param1) = 0;
+        virtual bool shh_hasIdentity(const std::string& param1) = 0;
         virtual std::string shh_newGroup(const std::string& param1, const std::string& param2) = 0;
         virtual std::string shh_addToGroup(const std::string& param1, const std::string& param2) = 0;
-        virtual int shh_newFilter(const Json::Value& param1) = 0;
-        virtual bool shh_uninstallFilter(int param1) = 0;
-        virtual Json::Value shh_changed(int param1) = 0;
-        virtual Json::Value shh_getMessages(int param1) = 0;
+        virtual std::string shh_newFilter(const Json::Value& param1) = 0;
+        virtual bool shh_uninstallFilter(const std::string& param1) = 0;
+        virtual Json::Value shh_getFilterChanges(const std::string& param1) = 0;
+        virtual Json::Value shh_getMessages(const std::string& param1) = 0;
 };
 
 #endif //JSONRPC_CPP_STUB_ABSTRACTWEBTHREESTUBSERVER_H_
diff --git a/libweb3jsonrpc/spec.json b/libweb3jsonrpc/spec.json
index 3f4227421..99e5761f8 100644
--- a/libweb3jsonrpc/spec.json
+++ b/libweb3jsonrpc/spec.json
@@ -1,73 +1,61 @@
 [
             { "name": "web3_sha3", "params": [""], "order": [], "returns" : "" },
+            { "name": "web3_clientVersion", "params": [], "order": [], "returns" : "" },
+
+            { "name": "net_version", "params": [], "order": [], "returns" : "" },
+            { "name": "net_peerCount", "params": [], "order": [], "returns" : "" },
+            { "name": "net_listening", "params": [], "order": [], "returns" : false },
 
             { "name": "eth_coinbase", "params": [], "order": [], "returns" : "" },
-            { "name": "eth_setCoinbase", "params": [""], "order": [], "returns" : true },
-            { "name": "eth_listening", "params": [], "order": [], "returns" : false },
-            { "name": "eth_setListening", "params": [false], "order" : [], "returns" : true },
             { "name": "eth_mining", "params": [], "order": [], "returns" : false },
-            { "name": "eth_setMining", "params": [false], "order" : [], "returns" : true },
             { "name": "eth_gasPrice", "params": [], "order": [], "returns" : "" },
             { "name": "eth_accounts", "params": [], "order": [], "returns" : [] },
-            { "name": "eth_peerCount", "params": [], "order": [], "returns" : 0 },
-            { "name": "eth_defaultBlock", "params": [], "order": [], "returns" : 0},
-            { "name": "eth_setDefaultBlock", "params": [0], "order": [], "returns" : true},
-            { "name": "eth_number", "params": [], "order": [], "returns" : 0},
-
-            { "name": "eth_balanceAt", "params": [""], "order": [], "returns" : ""},
-            { "name": "eth_stateAt", "params": ["", ""], "order": [], "returns": ""},
-            { "name": "eth_storageAt", "params": [""], "order": [], "returns": {}},
-            { "name": "eth_countAt", "params": [""], "order": [], "returns" : 0.0},
-            { "name": "eth_transactionCountByHash", "params": [""], "order": [], "returns" : 0.0},
-            { "name": "eth_transactionCountByNumber", "params": [0], "order": [], "returns" : 0.0},
-            { "name": "eth_uncleCountByHash", "params": [""], "order": [], "returns" : 0.0},
-            { "name": "eth_uncleCountByNumber", "params": [0], "order": [], "returns" : 0.0},
-            { "name": "eth_codeAt", "params": [""], "order": [], "returns": ""},
-
-            { "name": "eth_transact", "params": [{}], "order": [], "returns": ""},
-            { "name": "eth_call", "params": [{}], "order": [], "returns": ""},
+            { "name": "eth_blockNumber", "params": [], "order": [], "returns" : ""},
+            { "name": "eth_getBalance", "params": ["", ""], "order": [], "returns" : ""},
+            { "name": "eth_getStorageAt", "params": ["", "", ""], "order": [], "returns": ""},
+            { "name": "eth_getTransactionCount", "params": ["", ""], "order": [], "returns" : ""},
+            { "name": "eth_getBlockTransactionCountByHash", "params": [""], "order": [], "returns" : ""},
+            { "name": "eth_getBlockTransactionCountByNumber", "params": [""], "order": [], "returns" : ""},
+            { "name": "eth_getUncleCountByBlockHash", "params": [""], "order": [], "returns" : ""},
+            { "name": "eth_getUncleCountByBlockNumber", "params": [""], "order": [], "returns" : ""},
+			{ "name": "eth_getCode", "params": ["", ""], "order": [], "returns": ""},
+            { "name": "eth_sendTransaction", "params": [{}], "order": [], "returns": ""},
+            { "name": "eth_call", "params": [{}, ""], "order": [], "returns": ""},
             { "name": "eth_flush", "params": [], "order": [], "returns" : true},
-
-            { "name": "eth_blockByHash", "params": [""],"order": [], "returns": {}},
-            { "name": "eth_blockByNumber", "params": [0],"order": [], "returns": {}},
-            { "name": "eth_transactionByHash", "params": ["", 0], "order": [], "returns": {}},
-            { "name": "eth_transactionByNumber", "params": [0, 0], "order": [], "returns": {}},
-            { "name": "eth_uncleByHash", "params": ["", 0], "order": [], "returns": {}},
-            { "name": "eth_uncleByNumber", "params": [0, 0], "order": [], "returns": {}},
-
-            { "name": "eth_compilers", "params": [], "order": [], "returns": []},
-            { "name": "eth_lll", "params": [""], "order": [], "returns": ""},
-            { "name": "eth_solidity", "params": [""], "order": [], "returns": ""},
-            { "name": "eth_serpent", "params": [""], "order": [], "returns": ""},
-
-            { "name": "eth_newFilter", "params": [{}], "order": [], "returns": 0},
-            { "name": "eth_newFilterString", "params": [""], "order": [], "returns": 0},
-            { "name": "eth_uninstallFilter", "params": [0], "order": [], "returns": true},
-            { "name": "eth_changed", "params": [0], "order": [], "returns": []},
-            { "name": "eth_filterLogs", "params": [0], "order": [], "returns": []},
-            { "name": "eth_logs", "params": [{}], "order": [], "returns": []},
-
+            { "name": "eth_getBlockByHash", "params": ["", false],"order": [], "returns": {}},
+            { "name": "eth_getBlockByNumber", "params": ["", false],"order": [], "returns": {}},
+            { "name": "eth_getTransactionByHash", "params": [""], "order": [], "returns": {}},
+            { "name": "eth_getTransactionByBlockHashAndIndex", "params": ["", ""], "order": [], "returns": {}},
+            { "name": "eth_getTransactionByBlockNumberAndIndex", "params": ["", ""], "order": [], "returns": {}},
+            { "name": "eth_getUncleByBlockHashAndIndex", "params": ["", ""], "order": [], "returns": {}},
+            { "name": "eth_getUncleByBlockNumberAndIndex", "params": ["", ""], "order": [], "returns": {}},
+            { "name": "eth_getCompilers", "params": [], "order": [], "returns": []},
+            { "name": "eth_compileLLL", "params": [""], "order": [], "returns": ""},
+            { "name": "eth_compileSerpent", "params": [""], "order": [], "returns": ""},
+            { "name": "eth_compileSolidity", "params": [""], "order": [], "returns": ""},
+            { "name": "eth_newFilter", "params": [{}], "order": [], "returns": ""},
+            { "name": "eth_newBlockFilter", "params": [""], "order": [], "returns": ""},
+            { "name": "eth_uninstallFilter", "params": [""], "order": [], "returns": true},
+            { "name": "eth_getFilterChanges", "params": [""], "order": [], "returns": []},
+            { "name": "eth_getFilterLogs", "params": [""], "order": [], "returns": []},
+            { "name": "eth_getLogs", "params": [{}], "order": [], "returns": []},
             { "name": "eth_getWork", "params": [], "order": [], "returns": []},
             { "name": "eth_submitWork", "params": ["", ""], "order": [], "returns": true},
-
-            { "name": "eth_register", "params": [""], "order": [], "returns": 0},
-            { "name": "eth_unregister", "params": [0], "order": [], "returns": true},
-            { "name": "eth_queuedTransactions", "params": [0], "order": [], "returns": []},
+            { "name": "eth_register", "params": [""], "order": [], "returns": ""},
+            { "name": "eth_unregister", "params": [""], "order": [], "returns": true},
+            { "name": "eth_fetchQueuedTransactions", "params": [""], "order": [], "returns": []},
 
             { "name": "db_put", "params": ["", "", ""], "order": [], "returns": true},
             { "name": "db_get", "params": ["", ""], "order": [], "returns": ""},
-            { "name": "db_putString", "params": ["", "", ""], "order": [], "returns": true},
-            { "name": "db_getString", "params": ["", ""], "order": [], "returns": ""},
 
             { "name": "shh_post", "params": [{}], "order": [], "returns": true},
             { "name": "shh_newIdentity", "params": [], "order": [], "returns": ""},
-            { "name": "shh_haveIdentity", "params": [""], "order": [], "returns": false},
+            { "name": "shh_hasIdentity", "params": [""], "order": [], "returns": false},
             { "name": "shh_newGroup", "params": ["", ""], "order": [], "returns": ""},
             { "name": "shh_addToGroup", "params": ["", ""], "order": [], "returns": ""},
-            
-            { "name": "shh_newFilter", "params": [{}], "order": [], "returns": 0},
-            { "name": "shh_uninstallFilter", "params": [0], "order": [], "returns": true},
-            { "name": "shh_changed", "params": [0], "order": [], "returns": []},
-            { "name": "shh_getMessages", "params": [0], "order": [], "returns": []}
+            { "name": "shh_newFilter", "params": [{}], "order": [], "returns": ""},
+            { "name": "shh_uninstallFilter", "params": [""], "order": [], "returns": true},
+            { "name": "shh_getFilterChanges", "params": [""], "order": [], "returns": []},
+            { "name": "shh_getMessages", "params": [""], "order": [], "returns": []}
 ]
 
diff --git a/mix/CodeModel.cpp b/mix/CodeModel.cpp
index ff1cb9839..72359c130 100644
--- a/mix/CodeModel.cpp
+++ b/mix/CodeModel.cpp
@@ -318,17 +318,17 @@ SolidityType CodeModel::nodeType(solidity::Type const* _type)
 		{
 			IntegerType const* it = dynamic_cast<IntegerType const*>(_type);
 			r.size = it->getNumBits() / 8;
-			r.type = it->isAddress() ? SolidityType::Type::Address : it->isHash() ? SolidityType::Type::Hash : it->isSigned() ? SolidityType::Type::SignedInteger : SolidityType::Type::UnsignedInteger;
+			r.type = it->isAddress() ? SolidityType::Type::Address : it->isSigned() ? SolidityType::Type::SignedInteger : SolidityType::Type::UnsignedInteger;
 		}
 		break;
 	case Type::Category::Bool:
 		r.type = SolidityType::Type::Bool;
 		break;
-	case Type::Category::String:
+	case Type::Category::FixedBytes:
 		{
-			StaticStringType const* s = dynamic_cast<StaticStringType const*>(_type);
-			r.type = SolidityType::Type::String;
-			r.size = static_cast<unsigned>(s->getNumBytes());
+			FixedBytesType const* b = dynamic_cast<FixedBytesType const*>(_type);
+			r.type = SolidityType::Type::Bytes;
+			r.size = static_cast<unsigned>(b->getNumBytes());
 		}
 	case Type::Category::Contract:
 		r.type = SolidityType::Type::Address;
diff --git a/mix/MixClient.cpp b/mix/MixClient.cpp
index 061057bb4..e088a093b 100644
--- a/mix/MixClient.cpp
+++ b/mix/MixClient.cpp
@@ -40,6 +40,8 @@ namespace dev
 namespace mix
 {
 
+// TODO: merge as much as possible with the Client.cpp into a mutually inherited base class.
+
 const Secret c_defaultUserAccountSecret = Secret("cb73d9408c4720e230387d956eb0f829d8a4dd2c1055f96257167e14e7169074");
 const u256 c_mixGenesisDifficulty = c_minimumDifficulty; //TODO: make it lower for Mix somehow
 
@@ -54,10 +56,10 @@ public:
 	static bytes createGenesisBlock(h256 _stateRoot)
 	{
 		RLPStream block(3);
-		block.appendList(16)
+		block.appendList(15)
 			<< h256() << EmptyListSHA3 << h160() << _stateRoot << EmptyTrie << EmptyTrie
-			<< LogBloom() << c_mixGenesisDifficulty << 0 << 1000000 << 0 << (unsigned)0
-			<< std::string() << h256() << h256() << h64(u64(42));
+			<< LogBloom() << c_mixGenesisDifficulty << 0 << c_genesisGasLimit << 0 << (unsigned)0
+			<< std::string() << h256() << h64(u64(42));
 		block.appendRaw(RLPEmptyList);
 		block.appendRaw(RLPEmptyList);
 		return block.out();
@@ -274,13 +276,13 @@ void MixClient::flushTransactions()
 {
 }
 
-bytes MixClient::call(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice)
+bytes MixClient::call(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, int _blockNumber)
 {
 	u256 n;
 	State temp;
 	{
 		ReadGuard lr(x_state);
-		temp = m_state;
+		temp = asOf(_blockNumber);
 		n = temp.transactionsFrom(toAddress(_secret));
 	}
 	Transaction t(_value, _gasPrice, _gas, _dest, _data, n, _secret);
@@ -331,7 +333,6 @@ eth::LocalisedLogEntries MixClient::logs(eth::LogFilter const& _f) const
 	unsigned lastBlock = bc().number();
 	unsigned block = std::min<unsigned>(lastBlock, (unsigned)_f.latest());
 	unsigned end = std::min(lastBlock, std::min(block, (unsigned)_f.earliest()));
-	unsigned skip = _f.skip();
 	// Pending transactions
 	if (block > bc().number())
 	{
@@ -341,9 +342,8 @@ eth::LocalisedLogEntries MixClient::logs(eth::LogFilter const& _f) const
 			// Might have a transaction that contains a matching log.
 			TransactionReceipt const& tr = m_state.receipt(i);
 			LogEntries logEntries = _f.matches(tr);
-			for (unsigned entry = 0; entry < logEntries.size() && ret.size() != _f.max(); ++entry)
+			for (unsigned entry = 0; entry < logEntries.size(); ++entry)
 				ret.insert(ret.begin(), LocalisedLogEntry(logEntries[entry], block));
-			skip -= std::min(skip, static_cast<unsigned>(logEntries.size()));
 		}
 		block = bc().number();
 	}
@@ -355,24 +355,20 @@ eth::LocalisedLogEntries MixClient::logs(eth::LogFilter const& _f) const
 		if (_f.matches(bc().info(h).logBloom))
 			for (TransactionReceipt receipt: bc().receipts(h).receipts)
 				if (_f.matches(receipt.bloom()))
-				{
-					LogEntries logEntries = _f.matches(receipt);
-					for (unsigned entry = skip; entry < logEntries.size() && ret.size() != _f.max(); ++entry)
-						ret.insert(ret.begin(), LocalisedLogEntry(logEntries[entry], block));
-					skip -= std::min(skip, static_cast<unsigned>(logEntries.size()));
-				}
+					for (auto const& e: _f.matches(receipt))
+						ret.insert(ret.begin(), LocalisedLogEntry(e, block));
 		h = bc().details(h).parent;
 	}
 	return ret;
 }
 
-unsigned MixClient::installWatch(h256 _h)
+unsigned MixClient::installWatch(h256 _h, eth::Reaping _r)
 {
 	unsigned ret;
 	{
 		Guard l(m_filterLock);
 		ret = m_watches.size() ? m_watches.rbegin()->first + 1 : 0;
-		m_watches[ret] = ClientWatch(_h);
+		m_watches[ret] = ClientWatch(_h, _r);
 	}
 	auto ch = logs(ret);
 	if (ch.empty())
@@ -384,23 +380,23 @@ unsigned MixClient::installWatch(h256 _h)
 	return ret;
 }
 
-unsigned MixClient::installWatch(eth::LogFilter const& _f)
+unsigned MixClient::installWatch(eth::LogFilter const& _f, eth::Reaping _r)
 {
 	h256 h = _f.sha3();
 	{
 		Guard l(m_filterLock);
 		m_filters.insert(std::make_pair(h, _f));
 	}
-	return installWatch(h);
+	return installWatch(h, _r);
 }
 
-void MixClient::uninstallWatch(unsigned _i)
+bool MixClient::uninstallWatch(unsigned _i)
 {
 	Guard l(m_filterLock);
 
 	auto it = m_watches.find(_i);
 	if (it == m_watches.end())
-		return;
+		return false;
 	auto id = it->second.id;
 	m_watches.erase(it);
 
@@ -408,6 +404,8 @@ void MixClient::uninstallWatch(unsigned _i)
 	if (fit != m_filters.end())
 		if (!--fit->second.refCount)
 			m_filters.erase(fit);
+
+	return true;
 }
 
 void MixClient::noteChanged(h256Set const& _filters)
@@ -462,6 +460,11 @@ eth::BlockDetails MixClient::blockDetails(h256 _hash) const
 	return bc().details(_hash);
 }
 
+Transaction MixClient::transaction(h256 _transactionHash) const
+{
+	return Transaction(bc().transaction(_transactionHash), CheckSignature::Range);
+}
+
 eth::Transaction MixClient::transaction(h256 _blockHash, unsigned _i) const
 {
 	auto bl = bc().block(_blockHash);
@@ -496,6 +499,21 @@ unsigned MixClient::uncleCount(h256 _blockHash) const
 	return b[2].itemCount();
 }
 
+Transactions MixClient::transactions(h256 _blockHash) const
+{
+	auto bl = bc().block(_blockHash);
+	RLP b(bl);
+	Transactions res;
+	for (unsigned i = 0; i < b[1].itemCount(); i++)
+		res.emplace_back(b[1][i].data(), CheckSignature::Range);
+	return res;
+}
+
+TransactionHashes MixClient::transactionHashes(h256 _blockHash) const
+{
+	return bc().transactionHashes(_blockHash);
+}
+
 unsigned MixClient::number() const
 {
 	return bc().number();
diff --git a/mix/MixClient.h b/mix/MixClient.h
index 958d9d8bd..af5c8ec2b 100644
--- a/mix/MixClient.h
+++ b/mix/MixClient.h
@@ -52,7 +52,7 @@ public:
 	Address transact(Secret _secret, u256 _endowment, bytes const& _init, u256 _gas, u256 _gasPrice) override;
 	void inject(bytesConstRef _rlp) override;
 	void flushTransactions() override;
-	bytes call(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice) override;
+	bytes call(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, int _blockNumber) override;
 	u256 balanceAt(Address _a, int _block) const override;
 	u256 countAt(Address _a, int _block) const override;
 	u256 stateAt(Address _a, u256 _l, int _block) const override;
@@ -60,18 +60,21 @@ public:
 	std::map<u256, u256> storageAt(Address _a, int _block) const override;
 	eth::LocalisedLogEntries logs(unsigned _watchId) const override;
 	eth::LocalisedLogEntries logs(eth::LogFilter const& _filter) const override;
-	unsigned installWatch(eth::LogFilter const& _filter) override;
-	unsigned installWatch(h256 _filterId) override;
-	void uninstallWatch(unsigned _watchId) override;
+	unsigned installWatch(eth::LogFilter const& _filter, eth::Reaping _r = eth::Reaping::Automatic) override;
+	unsigned installWatch(h256 _filterId, eth::Reaping _r = eth::Reaping::Automatic) override;
+	bool uninstallWatch(unsigned _watchId) override;
 	eth::LocalisedLogEntries peekWatch(unsigned _watchId) const override;
 	eth::LocalisedLogEntries checkWatch(unsigned _watchId) override;
 	h256 hashFromNumber(unsigned _number) const override;
 	eth::BlockInfo blockInfo(h256 _hash) const override;
 	eth::BlockDetails blockDetails(h256 _hash) const override;
+	eth::Transaction transaction(h256 _transactionHash) const override;
 	eth::Transaction transaction(h256 _blockHash, unsigned _i) const override;
 	eth::BlockInfo uncle(h256 _blockHash, unsigned _i) const override;
 	unsigned transactionCount(h256 _blockHash) const override;
 	unsigned uncleCount(h256 _blockHash) const override;
+	eth::Transactions transactions(h256 _blockHash) const override;
+	eth::TransactionHashes transactionHashes(h256 _blockHash) const override;
 	unsigned number() const override;
 	eth::Transactions pending() const override;
 	eth::StateDiff diff(unsigned _txi, h256 _block) const override;
diff --git a/mix/Web3Server.cpp b/mix/Web3Server.cpp
index 11cb56b1d..3de2d7ef8 100644
--- a/mix/Web3Server.cpp
+++ b/mix/Web3Server.cpp
@@ -55,21 +55,21 @@ void Web3Server::put(std::string const& _name, std::string const& _key, std::str
 	m_db[k] = _value;
 }
 
-Json::Value Web3Server::eth_changed(int _id)
+Json::Value Web3Server::eth_getFilterChanges(std::string const& _filterId)
 {
-	return WebThreeStubServerBase::eth_changed(_id);
+	return WebThreeStubServerBase::eth_getFilterChanges(_filterId);
 }
 
-std::string Web3Server::eth_transact(Json::Value const& _json)
+std::string Web3Server::eth_sendTransaction(Json::Value const& _json)
 {
-	std::string ret = WebThreeStubServerBase::eth_transact(_json);
+	std::string ret = WebThreeStubServerBase::eth_sendTransaction(_json);
 	emit newTransaction();
 	return ret;
 }
 
-std::string Web3Server::eth_call(Json::Value const& _json)
+std::string Web3Server::eth_call(Json::Value const& _json, std::string const& _blockNumber)
 {
-	std::string ret = WebThreeStubServerBase::eth_call(_json);
+	std::string ret = WebThreeStubServerBase::eth_call(_json, _blockNumber);
 	emit newTransaction();
 	return ret;
 }
diff --git a/mix/Web3Server.h b/mix/Web3Server.h
index 01a187ff7..71e2131ba 100644
--- a/mix/Web3Server.h
+++ b/mix/Web3Server.h
@@ -44,9 +44,9 @@ signals:
 	void newTransaction();
 
 protected:
-	virtual Json::Value eth_changed(int _id) override;
-	virtual std::string eth_transact(Json::Value const& _json) override;
-	virtual std::string eth_call(Json::Value const& _json) override;
+	virtual Json::Value eth_getFilterChanges(std::string const& _filterId) override;
+	virtual std::string eth_sendTransaction(Json::Value const& _json) override;
+	virtual std::string eth_call(Json::Value const& _json, std::string const& _blockNumber) override;
 
 private:
 	dev::eth::Interface* client() override { return m_client; }
diff --git a/mix/qml/LogsPane.qml b/mix/qml/LogsPane.qml
index 9d03b2af2..bef616f21 100644
--- a/mix/qml/LogsPane.qml
+++ b/mix/qml/LogsPane.qml
@@ -205,7 +205,7 @@ Rectangle
 			headerVisible : false
 			onDoubleClicked:
 			{
-				var log = logsModel.get((logsTable.currentRow));
+				var log = logsModel.get(logsTable.currentRow);
 				if (log)
 					appContext.toClipboard(log.type + "\t" + log.level + "\t" + log.date + "\t" + log.content);
 			}
diff --git a/mix/qml/WebPreview.qml b/mix/qml/WebPreview.qml
index ba2975453..34dc7c698 100644
--- a/mix/qml/WebPreview.qml
+++ b/mix/qml/WebPreview.qml
@@ -219,6 +219,14 @@ Item {
 					focus: true
 				}
 
+				Rectangle
+				{
+					width: 1
+					height: parent.height - 10
+					color: WebPreviewStyle.general.separatorColor
+					anchors.verticalCenter: parent.verticalCenter
+				}
+
 				CheckBox {
 					id: autoReloadOnSave
 					checked: true
@@ -231,15 +239,56 @@ Item {
 					}
 					focus: true
 				}
+
+				Rectangle
+				{
+					width: 1
+					height: parent.height - 10
+					color: WebPreviewStyle.general.separatorColor
+					anchors.verticalCenter: parent.verticalCenter
+				}
+
+				Button
+				{
+					height: 28
+					anchors.verticalCenter: parent.verticalCenter
+					action: expressionAction
+					iconSource: "qrc:/qml/img/console.png"
+				}
+
+				Action {
+					id: expressionAction
+					tooltip: qsTr("Expressions")
+					onTriggered:
+					{
+						expressionPanel.visible = !expressionPanel.visible;
+						if (expressionPanel.visible)
+						{
+							webView.width = webView.parent.width - 350
+							expressionInput.forceActiveFocus();
+						}
+						else
+							webView.width = webView.parent.width
+					}
+				}
 			}
 		}
 
 		Rectangle
+		{
+			Layout.preferredHeight: 1
+			Layout.preferredWidth: parent.width
+			color: WebPreviewStyle.general.separatorColor
+		}
+
+		SplitView
 		{
 			Layout.preferredWidth: parent.width
 			Layout.fillHeight: true
 			WebEngineView {
-				anchors.fill: parent
+				Layout.fillHeight: true
+				width: parent.width
+				Layout.preferredWidth: parent.width
 				id: webView
 				experimental.settings.localContentCanAccessRemoteUrls: true
 				onJavaScriptConsoleMessage: {
@@ -254,6 +303,123 @@ Item {
 					}
 				}
 			}
+
+			Column {
+				id: expressionPanel
+				width: 350
+				Layout.preferredWidth: 350
+				Layout.fillHeight: true
+				spacing: 0
+				visible: false
+				function addExpression()
+				{
+					if (expressionInput.text === "")
+						return;
+					expressionInput.history.unshift(expressionInput.text);
+					expressionInput.index = -1;
+					webView.runJavaScript("executeJavaScript(\"" + expressionInput.text.replace(/"/g, '\\"') + "\")", function(result) {
+						resultTextArea.text = "> " + result + "\n\n" + resultTextArea.text;
+						expressionInput.text = "";
+					});
+				}
+
+				Row
+				{
+					id: rowConsole
+					width: parent.width
+					Button
+					{
+						height: 22
+						width: 22
+						action: clearAction
+						iconSource: "qrc:/qml/img/broom.png"
+					}
+
+					Action {
+						id: clearAction
+						enabled: resultTextArea.text !== ""
+						tooltip: qsTr("Clear")
+						onTriggered: {
+							resultTextArea.text = "";
+						}
+					}
+
+					DefaultTextField {
+						id: expressionInput
+						width: parent.width - 15
+						height: 20
+						font.family: WebPreviewStyle.general.fontName
+						font.italic: true
+						font.pointSize: Style.absoluteSize(-3)
+						anchors.verticalCenter: parent.verticalCenter
+
+						property var history: []
+						property int index: -1
+
+						function displayCache(incr)
+						{
+							index = index + incr;
+							if (history.length - 1 < index || index < 0)
+							{
+								if (incr === 1)
+									index = 0;
+								else
+									index = history.length - 1;
+							}
+							expressionInput.text = history[index];
+						}
+
+						Keys.onDownPressed: {
+							displayCache(1);
+						}
+
+						Keys.onUpPressed: {
+							displayCache(-1);
+						}
+
+						Keys.onEnterPressed:
+						{
+							expressionPanel.addExpression();
+						}
+
+						Keys.onReturnPressed:
+						{
+							expressionPanel.addExpression();
+						}
+
+						onFocusChanged:
+						{
+							if (!focus && text == "")
+								text = qsTr("Expression");
+							if (focus && text === qsTr("Expression"))
+								text = "";
+						}
+
+						style: TextFieldStyle {
+							background: Rectangle {
+								color: "transparent"
+							}
+						}
+					}
+				}
+
+				TextArea {
+					Layout.fillHeight: true
+					height: parent.height - rowConsole.height
+					readOnly: true
+					id: resultTextArea
+					width: expressionPanel.width
+					wrapMode: Text.Wrap
+					font.family: WebPreviewStyle.general.fontName
+					font.pointSize: Style.absoluteSize(-3)
+					backgroundVisible: true
+					style: TextAreaStyle {
+						backgroundColor: "#f0f0f0"
+					}
+				}
+			}
 		}
 	}
 }
+
+
diff --git a/mix/qml/WebPreviewStyle.qml b/mix/qml/WebPreviewStyle.qml
index 551f5a446..231bbe16c 100644
--- a/mix/qml/WebPreviewStyle.qml
+++ b/mix/qml/WebPreviewStyle.qml
@@ -10,5 +10,7 @@ QtObject {
 
 	property QtObject general: QtObject {
 		property string headerBackgroundColor: "#f0f0f0"
+		property string separatorColor: "#808080"
+		property string fontName: "sans serif"
 	}
 }
diff --git a/mix/qml/html/WebContainer.html b/mix/qml/html/WebContainer.html
index e2f97fd86..8cd65a55a 100644
--- a/mix/qml/html/WebContainer.html
+++ b/mix/qml/html/WebContainer.html
@@ -17,7 +17,7 @@ reloadPage = function() {
 
 updateContracts = function(contracts) {
 	if (window.web3) {
-	    window.web3.reset();
+		window.web3.reset();
 		window.contracts = {};
 		for (var c in contracts) {
 			var contract = window.web3.eth.contract(contracts[c].address, contracts[c].interface);
@@ -33,9 +33,15 @@ updateContracts = function(contracts) {
 init = function(url) {
 	web3 = require('web3');
 	window.web3 = web3;
-	web3.setProvider(new web3.providers.HttpSyncProvider(url));
+	web3.setProvider(new web3.providers.HttpProvider(url));
 };
 
+executeJavaScript = function(script) {
+	var preview = document.getElementById('preview');
+	var obj = preview.contentWindow.eval(script);
+	return JSON.stringify(obj, null, 2);
+}
+
 </script>
 
 <style>
diff --git a/mix/qml/img/console.png b/mix/qml/img/console.png
new file mode 100644
index 000000000..6958d5309
Binary files /dev/null and b/mix/qml/img/console.png differ
diff --git a/mix/res.qrc b/mix/res.qrc
index 9cca4a859..f20332eec 100644
--- a/mix/res.qrc
+++ b/mix/res.qrc
@@ -112,5 +112,6 @@
         <file>qml/LogsPaneStyle.qml</file>
         <file>qml/SolidityTypeConverter.qml</file>
         <file>qml/StructView.qml</file>
+        <file>qml/img/console.png</file>
     </qresource>
 </RCC>
diff --git a/test/Assembly.cpp b/test/Assembly.cpp
index 3869919e7..fbc8e47b5 100644
--- a/test/Assembly.cpp
+++ b/test/Assembly.cpp
@@ -74,17 +74,19 @@ eth::AssemblyItems compileContract(const string& _sourceCode)
 	return AssemblyItems();
 }
 
-void checkAssemblyLocations(AssemblyItems const& _items, std::vector<SourceLocation> _locations)
+void checkAssemblyLocations(AssemblyItems const& _items, vector<SourceLocation> const& _locations)
 {
-	size_t i = 0;
 	BOOST_CHECK_EQUAL(_items.size(), _locations.size());
-	for (auto const& it: _items)
+	for (size_t i = 0; i < min(_items.size(), _locations.size()); ++i)
 	{
-		BOOST_CHECK_MESSAGE(it.getLocation() == _locations[i],
-							std::string("Location mismatch for assembly item ") + std::to_string(i));
-		++i;
+		BOOST_CHECK_MESSAGE(
+			_items[i].getLocation() == _locations[i],
+			"Location mismatch for assembly item " + to_string(i) + ". Found: " +
+					to_string(_items[i].getLocation().start) + "-" +
+					to_string(_items[i].getLocation().end) + ", expected: " +
+					to_string(_locations[i].start) + "-" +
+					to_string(_locations[i].end));
 	}
-
 }
 
 } // end anonymous namespace
@@ -93,31 +95,21 @@ BOOST_AUTO_TEST_SUITE(Assembly)
 
 BOOST_AUTO_TEST_CASE(location_test)
 {
-	char const* sourceCode = "contract test {\n"
-							 "  function f() returns (uint256 a)\n"
-							 "  {\n"
-							 "      return 16;\n"
-							 "  }\n"
-							 "}\n";
-	std::shared_ptr<std::string const> n = make_shared<std::string>("source");
+	char const* sourceCode = R"(
+	contract test {
+		function f() returns (uint256 a) {
+			return 16;
+		}
+	}
+	)";
+	shared_ptr<string const> n = make_shared<string>("source");
 	AssemblyItems items = compileContract(sourceCode);
-	std::vector<SourceLocation> locations {
-		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
-		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
-		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
-		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
-		SourceLocation(), SourceLocation(),
-		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
-		SourceLocation(), SourceLocation(), SourceLocation(),
-		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
-		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
-		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
-		SourceLocation(0, 77, n),
-		SourceLocation(18, 75, n), SourceLocation(40, 49, n),
-		SourceLocation(61, 70, n), SourceLocation(61, 70, n), SourceLocation(61, 70, n),
-		SourceLocation(), SourceLocation(),
-		SourceLocation(61, 70, n), SourceLocation(61, 70, n), SourceLocation(61, 70, n)
-		};
+	vector<SourceLocation> locations =
+		vector<SourceLocation>(11, SourceLocation(2, 75, n)) +
+		vector<SourceLocation>(12, SourceLocation(20, 72, n)) +
+		vector<SourceLocation>{SourceLocation(42, 51, n), SourceLocation(65, 67, n)} +
+		vector<SourceLocation>(4, SourceLocation(58, 67, n)) +
+		vector<SourceLocation>(3, SourceLocation(20, 72, n));
 	checkAssemblyLocations(items, locations);
 }
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 292f62a03..d7761b8d3 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,8 +1,10 @@
 cmake_policy(SET CMP0015 NEW)
 
 aux_source_directory(. SRC_LIST)
-list(REMOVE_ITEM SRC_LIST "./createRandomTest.cpp")
-list(REMOVE_ITEM SRC_LIST "./checkRandomTest.cpp")
+list(REMOVE_ITEM SRC_LIST "./createRandomVMTest.cpp")
+list(REMOVE_ITEM SRC_LIST "./createRandomStateTest.cpp")
+list(REMOVE_ITEM SRC_LIST "./checkRandomVMTest.cpp")
+list(REMOVE_ITEM SRC_LIST "./checkRandomStateTest.cpp")
 
 if (NOT JSONRPC)
 	list(REMOVE_ITEM SRC_LIST "./AccountHolder.cpp")
@@ -17,8 +19,10 @@ include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
 
 file(GLOB HEADERS "*.h")
 add_executable(testeth ${SRC_LIST} ${HEADERS})
-add_executable(createRandomTest createRandomTest.cpp vm.cpp TestHelper.cpp)
-add_executable(checkRandomTest checkRandomTest.cpp vm.cpp TestHelper.cpp)
+add_executable(createRandomVMTest createRandomVMTest.cpp vm.cpp TestHelper.cpp)
+add_executable(createRandomStateTest createRandomStateTest.cpp TestHelper.cpp)
+add_executable(checkRandomVMTest checkRandomVMTest.cpp vm.cpp TestHelper.cpp)
+add_executable(checkRandomStateTest checkRandomStateTest.cpp TestHelper.cpp)
 
 target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
 target_link_libraries(testeth ${CURL_LIBRARIES})
@@ -35,10 +39,16 @@ if (JSONRPC)
 	target_link_libraries(testeth ${JSON_RPC_CPP_CLIENT_LIBRARIES})
 endif()
 
-target_link_libraries(createRandomTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
-target_link_libraries(createRandomTest ethereum)
-target_link_libraries(createRandomTest ethcore)
-target_link_libraries(checkRandomTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
-target_link_libraries(checkRandomTest ethereum)
-target_link_libraries(checkRandomTest ethcore)
+target_link_libraries(createRandomVMTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
+target_link_libraries(createRandomVMTest ethereum)
+target_link_libraries(createRandomVMTest ethcore)
+target_link_libraries(createRandomStateTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
+target_link_libraries(createRandomStateTest ethereum)
+target_link_libraries(createRandomStateTest ethcore)
+target_link_libraries(checkRandomVMTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
+target_link_libraries(checkRandomVMTest ethereum)
+target_link_libraries(checkRandomVMTest ethcore)
+target_link_libraries(checkRandomStateTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
+target_link_libraries(checkRandomStateTest ethereum)
+target_link_libraries(checkRandomStateTest ethcore)
 
diff --git a/test/SolidityABIJSON.cpp b/test/SolidityABIJSON.cpp
index 5f67a5667..195270138 100644
--- a/test/SolidityABIJSON.cpp
+++ b/test/SolidityABIJSON.cpp
@@ -339,10 +339,10 @@ BOOST_AUTO_TEST_CASE(inherited)
 	char const* sourceCode =
 	"	contract Base { \n"
 	"		function baseFunction(uint p) returns (uint i) { return p; } \n"
-	"		event baseEvent(string32 indexed evtArgBase); \n"
+	"		event baseEvent(bytes32 indexed evtArgBase); \n"
 	"	} \n"
 	"	contract Derived is Base { \n"
-	"		function derivedFunction(string32 p) returns (string32 i) { return p; } \n"
+	"		function derivedFunction(bytes32 p) returns (bytes32 i) { return p; } \n"
 	"		event derivedEvent(uint indexed evtArgDerived); \n"
 	"	}";
 
@@ -369,12 +369,12 @@ BOOST_AUTO_TEST_CASE(inherited)
 		"inputs":
 		[{
 			"name": "p",
-			"type": "string32"
+			"type": "bytes32"
 		}],
 		"outputs":
 		[{
 			"name": "i",
-			"type": "string32"
+			"type": "bytes32"
 		}]
 	},
 	{
@@ -394,7 +394,7 @@ BOOST_AUTO_TEST_CASE(inherited)
 		[{
 			"indexed": true,
 			"name": "evtArgBase",
-			"type": "string32"
+			"type": "bytes32"
 		}]
 	}])";
 
diff --git a/test/SolidityEndToEndTest.cpp b/test/SolidityEndToEndTest.cpp
index 3205c038a..07ad3edbc 100644
--- a/test/SolidityEndToEndTest.cpp
+++ b/test/SolidityEndToEndTest.cpp
@@ -507,23 +507,23 @@ BOOST_AUTO_TEST_CASE(small_signed_types)
 BOOST_AUTO_TEST_CASE(strings)
 {
 	char const* sourceCode = "contract test {\n"
-							 "  function fixed() returns(string32 ret) {\n"
+							 "  function fixed() returns(bytes32 ret) {\n"
 							 "    return \"abc\\x00\\xff__\";\n"
 							 "  }\n"
-							 "  function pipeThrough(string2 small, bool one) returns(string16 large, bool oneRet) {\n"
+							 "  function pipeThrough(bytes2 small, bool one) returns(bytes16 large, bool oneRet) {\n"
 							 "    oneRet = one;\n"
 							 "    large = small;\n"
 							 "  }\n"
 							 "}\n";
 	compileAndRun(sourceCode);
 	BOOST_CHECK(callContractFunction("fixed()") == encodeArgs(string("abc\0\xff__", 7)));
-	BOOST_CHECK(callContractFunction("pipeThrough(string2,bool)", string("\0\x02", 2), true) == encodeArgs(string("\0\x2", 2), true));
+	BOOST_CHECK(callContractFunction("pipeThrough(bytes2,bool)", string("\0\x02", 2), true) == encodeArgs(string("\0\x2", 2), true));
 }
 
 BOOST_AUTO_TEST_CASE(empty_string_on_stack)
 {
 	char const* sourceCode = "contract test {\n"
-							 "  function run(string0 empty, uint8 inp) returns(uint16 a, string0 b, string4 c) {\n"
+							 "  function run(bytes0 empty, uint8 inp) returns(uint16 a, bytes0 b, bytes4 c) {\n"
 							 "    var x = \"abc\";\n"
 							 "    var y = \"\";\n"
 							 "    var z = inp;\n"
@@ -531,7 +531,7 @@ BOOST_AUTO_TEST_CASE(empty_string_on_stack)
 							 "  }\n"
 							 "}\n";
 	compileAndRun(sourceCode);
-	BOOST_CHECK(callContractFunction("run(string0,uint8)", string(), byte(0x02)) == encodeArgs(0x2, string(""), string("abc\0")));
+	BOOST_CHECK(callContractFunction("run(bytes0,uint8)", string(), byte(0x02)) == encodeArgs(0x2, string(""), string("abc\0")));
 }
 
 BOOST_AUTO_TEST_CASE(state_smoke_test)
@@ -948,8 +948,8 @@ BOOST_AUTO_TEST_CASE(multiple_elementary_accessors)
 {
 	char const* sourceCode = "contract test {\n"
 							 "  uint256 public data;\n"
-							 "  string6 public name;\n"
-							 "  hash public a_hash;\n"
+							 "  bytes6 public name;\n"
+							 "  bytes32 public a_hash;\n"
 							 "  address public an_address;\n"
 							 "  function test() {\n"
 							 "    data = 8;\n"
@@ -971,7 +971,7 @@ BOOST_AUTO_TEST_CASE(multiple_elementary_accessors)
 BOOST_AUTO_TEST_CASE(complex_accessors)
 {
 	char const* sourceCode = "contract test {\n"
-							 "  mapping(uint256 => string4) public to_string_map;\n"
+							 "  mapping(uint256 => bytes4) public to_string_map;\n"
 							 "  mapping(uint256 => bool) public to_bool_map;\n"
 							 "  mapping(uint256 => uint256) public to_uint_map;\n"
 							 "  mapping(uint256 => mapping(uint256 => uint256)) public to_multiple_map;\n"
@@ -1076,96 +1076,96 @@ BOOST_AUTO_TEST_CASE(type_conversions_cleanup)
 														   0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x11, 0x22}));
 }
 
-BOOST_AUTO_TEST_CASE(convert_string_to_string)
+BOOST_AUTO_TEST_CASE(convert_fixed_bytes_to_fixed_bytes_smaller_size)
 {
 	char const* sourceCode = R"(
 		contract Test {
-			function pipeTrough(string3 input) returns (string3 ret) {
-				return string3(input);
+			function pipeTrough(bytes3 input) returns (bytes2 ret) {
+				return bytes2(input);
 			}
 		})";
 	compileAndRun(sourceCode);
-	BOOST_CHECK(callContractFunction("pipeTrough(string3)", "abc") == encodeArgs("abc"));
+	BOOST_CHECK(callContractFunction("pipeTrough(bytes3)", "abc") == encodeArgs("ab"));
 }
 
-BOOST_AUTO_TEST_CASE(convert_hash_to_string_same_size)
+BOOST_AUTO_TEST_CASE(convert_uint_to_fixed_bytes_same_size)
 {
 	char const* sourceCode = R"(
 		contract Test {
-			function hashToString(hash h) returns (string32 s) {
-				return string32(h);
+			function uintToBytes(uint256 h) returns (bytes32 s) {
+				return bytes32(h);
 			}
 		})";
 	compileAndRun(sourceCode);
 	u256 a("0x6162630000000000000000000000000000000000000000000000000000000000");
-	BOOST_CHECK(callContractFunction("hashToString(hash256)", a) == encodeArgs(a));
+	BOOST_CHECK(callContractFunction("uintToBytes(uint256)", a) == encodeArgs(a));
 }
 
-BOOST_AUTO_TEST_CASE(convert_hash_to_string_different_size)
+BOOST_AUTO_TEST_CASE(convert_uint_to_fixed_bytes_different_size)
 {
 	char const* sourceCode = R"(
 		contract Test {
-			function hashToString(hash160 h) returns (string20 s) {
-				return string20(h);
+			function uintToBytes(uint160 h) returns (bytes20 s) {
+				return bytes20(h);
 			}
 		})";
 	compileAndRun(sourceCode);
-	BOOST_CHECK(callContractFunction("hashToString(hash160)", u160("0x6161626361626361626361616263616263616263")) ==
-						encodeArgs(string("aabcabcabcaabcabcabc")));
+	BOOST_CHECK(callContractFunction("uintToBytes(uint160)",
+			u160("0x6161626361626361626361616263616263616263")) == encodeArgs(string("aabcabcabcaabcabcabc")));
 }
 
-BOOST_AUTO_TEST_CASE(convert_string_to_hash_same_size)
+BOOST_AUTO_TEST_CASE(convert_fixed_bytes_to_uint_same_size)
 {
 	char const* sourceCode = R"(
 		contract Test {
-			function stringToHash(string32 s) returns (hash h) {
-				return hash(s);
+			function bytesToUint(bytes32 s) returns (uint256 h) {
+				return uint(s);
 			}
 		})";
 	compileAndRun(sourceCode);
-	BOOST_CHECK(callContractFunction("stringToHash(string32)", string("abc2")) ==
-					encodeArgs(u256("0x6162633200000000000000000000000000000000000000000000000000000000")));
+	BOOST_CHECK(callContractFunction("bytesToUint(bytes32)", string("abc2")) ==
+		encodeArgs(u256("0x6162633200000000000000000000000000000000000000000000000000000000")));
 }
 
-BOOST_AUTO_TEST_CASE(convert_string_to_hash_different_size)
+BOOST_AUTO_TEST_CASE(convert_fixed_bytes_to_uint_different_size)
 {
 	char const* sourceCode = R"(
 		contract Test {
-			function stringToHash(string20 s) returns (hash160 h) {
-				return hash160(s);
+			function bytesToUint(bytes20 s) returns (uint160 h) {
+				return uint160(s);
 			}
 		})";
 	compileAndRun(sourceCode);
-	BOOST_CHECK(callContractFunction("stringToHash(string20)", string("aabcabcabcaabcabcabc")) ==
-					encodeArgs(u160("0x6161626361626361626361616263616263616263")));
+	BOOST_CHECK(callContractFunction("bytesToUint(bytes20)", string("aabcabcabcaabcabcabc")) ==
+		encodeArgs(u160("0x6161626361626361626361616263616263616263")));
 }
 
 
-BOOST_AUTO_TEST_CASE(convert_string_to_hash_different_min_size)
+BOOST_AUTO_TEST_CASE(convert_fixed_bytes_to_uint_different_min_size)
 {
 	char const* sourceCode = R"(
 		contract Test {
-			function stringToHash(string1 s) returns (hash8 h) {
-				return hash8(s);
+			function bytesToUint(bytes1 s) returns (uint8 h) {
+				return uint8(s);
 			}
 		})";
 	compileAndRun(sourceCode);
-	BOOST_CHECK(callContractFunction("stringToHash(string1)", string("a")) ==
-					encodeArgs(u256("0x61")));
+	BOOST_CHECK(callContractFunction("bytesToUint(bytes1)", string("a")) ==
+		encodeArgs(u256("0x61")));
 }
 
 
-BOOST_AUTO_TEST_CASE(convert_hash_to_string_different_min_size)
+BOOST_AUTO_TEST_CASE(convert_uint_to_fixed_bytes_different_min_size)
 {
 	char const* sourceCode = R"(
 		contract Test {
-			function HashToString(hash8 h) returns (string1 s) {
-				return string1(h);
+			function UintToBytes(uint8 h) returns (bytes1 s) {
+				return bytes1(h);
 			}
 		})";
 	compileAndRun(sourceCode);
-	BOOST_CHECK(callContractFunction("HashToString(hash8)", u256("0x61")) ==
-					encodeArgs(string("a")));
+	BOOST_CHECK(callContractFunction("UintToBytes(uint8)", u256("0x61")) ==
+		encodeArgs(string("a")));
 }
 
 BOOST_AUTO_TEST_CASE(send_ether)
@@ -1299,7 +1299,7 @@ BOOST_AUTO_TEST_CASE(suicide)
 BOOST_AUTO_TEST_CASE(sha3)
 {
 	char const* sourceCode = "contract test {\n"
-							 "  function a(hash input) returns (hash sha3hash) {\n"
+							 "  function a(bytes32 input) returns (bytes32 sha3hash) {\n"
 							 "    return sha3(input);\n"
 							 "  }\n"
 							 "}\n";
@@ -1308,15 +1308,15 @@ BOOST_AUTO_TEST_CASE(sha3)
 	{
 		return dev::sha3(toBigEndian(_x));
 	};
-	testSolidityAgainstCpp("a(hash256)", f, u256(4));
-	testSolidityAgainstCpp("a(hash256)", f, u256(5));
-	testSolidityAgainstCpp("a(hash256)", f, u256(-1));
+	testSolidityAgainstCpp("a(bytes32)", f, u256(4));
+	testSolidityAgainstCpp("a(bytes32)", f, u256(5));
+	testSolidityAgainstCpp("a(bytes32)", f, u256(-1));
 }
 
 BOOST_AUTO_TEST_CASE(sha256)
 {
 	char const* sourceCode = "contract test {\n"
-							 "  function a(hash input) returns (hash sha256hash) {\n"
+							 "  function a(bytes32 input) returns (bytes32 sha256hash) {\n"
 							 "    return sha256(input);\n"
 							 "  }\n"
 							 "}\n";
@@ -1327,15 +1327,15 @@ BOOST_AUTO_TEST_CASE(sha256)
 		dev::sha256(dev::ref(toBigEndian(_input)), bytesRef(&ret[0], 32));
 		return ret;
 	};
-	testSolidityAgainstCpp("a(hash256)", f, u256(4));
-	testSolidityAgainstCpp("a(hash256)", f, u256(5));
-	testSolidityAgainstCpp("a(hash256)", f, u256(-1));
+	testSolidityAgainstCpp("a(bytes32)", f, u256(4));
+	testSolidityAgainstCpp("a(bytes32)", f, u256(5));
+	testSolidityAgainstCpp("a(bytes32)", f, u256(-1));
 }
 
 BOOST_AUTO_TEST_CASE(ripemd)
 {
 	char const* sourceCode = "contract test {\n"
-							 "  function a(hash input) returns (hash sha256hash) {\n"
+							 "  function a(bytes32 input) returns (bytes32 sha256hash) {\n"
 							 "    return ripemd160(input);\n"
 							 "  }\n"
 							 "}\n";
@@ -1346,15 +1346,15 @@ BOOST_AUTO_TEST_CASE(ripemd)
 		dev::ripemd160(dev::ref(toBigEndian(_input)), bytesRef(&ret[0], 32));
 		return u256(ret) >> (256 - 160);
 	};
-	testSolidityAgainstCpp("a(hash256)", f, u256(4));
-	testSolidityAgainstCpp("a(hash256)", f, u256(5));
-	testSolidityAgainstCpp("a(hash256)", f, u256(-1));
+	testSolidityAgainstCpp("a(bytes32)", f, u256(4));
+	testSolidityAgainstCpp("a(bytes32)", f, u256(5));
+	testSolidityAgainstCpp("a(bytes32)", f, u256(-1));
 }
 
 BOOST_AUTO_TEST_CASE(ecrecover)
 {
 	char const* sourceCode = "contract test {\n"
-							 "  function a(hash h, uint8 v, hash r, hash s) returns (address addr) {\n"
+							 "  function a(bytes32 h, uint8 v, bytes32 r, bytes32 s) returns (address addr) {\n"
 							 "    return ecrecover(h, v, r, s);\n"
 							 "  }\n"
 							 "}\n";
@@ -1364,7 +1364,7 @@ BOOST_AUTO_TEST_CASE(ecrecover)
 	u256 r("0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f");
 	u256 s("0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549");
 	u160 addr("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b");
-	BOOST_CHECK(callContractFunction("a(hash256,uint8,hash256,hash256)", h, v, r, s) == encodeArgs(addr));
+	BOOST_CHECK(callContractFunction("a(bytes32,uint8,bytes32,bytes32)", h, v, r, s) == encodeArgs(addr));
 }
 
 BOOST_AUTO_TEST_CASE(inter_contract_calls)
@@ -1524,17 +1524,17 @@ BOOST_AUTO_TEST_CASE(inter_contract_calls_with_local_vars)
 	BOOST_REQUIRE(callContractFunction("callHelper(uint256,uint256)", a, b) == encodeArgs(a * b + 9));
 }
 
-BOOST_AUTO_TEST_CASE(strings_in_calls)
+BOOST_AUTO_TEST_CASE(fixed_bytes_in_calls)
 {
 	char const* sourceCode = R"(
 		contract Helper {
-			function invoke(string3 x, bool stop) returns (string4 ret) {
+			function invoke(bytes3 x, bool stop) returns (bytes4 ret) {
 				return x;
 			}
 		}
 		contract Main {
 			Helper h;
-			function callHelper(string2 x, bool stop) returns (string5 ret) {
+			function callHelper(bytes2 x, bool stop) returns (bytes5 ret) {
 				return h.invoke(x, stop);
 			}
 			function getHelper() returns (address addr) {
@@ -1549,21 +1549,21 @@ BOOST_AUTO_TEST_CASE(strings_in_calls)
 	compileAndRun(sourceCode, 0, "Main");
 	BOOST_REQUIRE(callContractFunction("setHelper(address)", c_helperAddress) == bytes());
 	BOOST_REQUIRE(callContractFunction("getHelper()", c_helperAddress) == encodeArgs(c_helperAddress));
-	BOOST_CHECK(callContractFunction("callHelper(string2,bool)", string("\0a", 2), true) == encodeArgs(string("\0a\0\0\0", 5)));
+	BOOST_CHECK(callContractFunction("callHelper(bytes2,bool)", string("\0a", 2), true) == encodeArgs(string("\0a\0\0\0", 5)));
 }
 
 BOOST_AUTO_TEST_CASE(constructor_arguments)
 {
 	char const* sourceCode = R"(
 		contract Helper {
-			string3 name;
+			bytes3 name;
 			bool flag;
 
-			function Helper(string3 x, bool f) {
+			function Helper(bytes3 x, bool f) {
 				name = x;
 				flag = f;
 			}
-			function getName() returns (string3 ret) { return name; }
+			function getName() returns (bytes3 ret) { return name; }
 			function getFlag() returns (bool ret) { return flag; }
 		}
 		contract Main {
@@ -1572,7 +1572,7 @@ BOOST_AUTO_TEST_CASE(constructor_arguments)
 				h = new Helper("abc", true);
 			}
 			function getFlag() returns (bool ret) { return h.getFlag(); }
-			function getName() returns (string3 ret) { return h.getName(); }
+			function getName() returns (bytes3 ret) { return h.getName(); }
 		})";
 	compileAndRun(sourceCode, 0, "Main");
 	BOOST_REQUIRE(callContractFunction("getFlag()") == encodeArgs(true));
@@ -1583,13 +1583,13 @@ BOOST_AUTO_TEST_CASE(functions_called_by_constructor)
 {
 	char const* sourceCode = R"(
 		contract Test {
-			string3 name;
+			bytes3 name;
 			bool flag;
 			function Test() {
 				setName("abc");
 			}
-			function getName() returns (string3 ret) { return name; }
-			function setName(string3 _name) private { name = _name; }
+			function getName() returns (bytes3 ret) { return name; }
+			function setName(bytes3 _name) private { name = _name; }
 		})";
 	compileAndRun(sourceCode);
 	BOOST_REQUIRE(callContractFunction("getName()") == encodeArgs("abc"));
@@ -1647,6 +1647,21 @@ BOOST_AUTO_TEST_CASE(gas_and_value_basic)
 	BOOST_REQUIRE(callContractFunction("checkState()", 5) == encodeArgs(false, 20 - 5));
 }
 
+BOOST_AUTO_TEST_CASE(gas_for_builtin)
+{
+	char const* sourceCode = R"(
+		contract Contract {
+			function test(uint g) returns (bytes32 data, bool flag) {
+				data = ripemd160.gas(g)("abc");
+				flag = true;
+			}
+		}
+	)";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(callContractFunction("test(uint256)", 500) == bytes());
+	BOOST_CHECK(callContractFunction("test(uint256)", 800) == encodeArgs(u256("0x8eb208f7e05d987a9b044a8e98c6b087f15a0bfc"), true));
+}
+
 BOOST_AUTO_TEST_CASE(value_complex)
 {
 	char const* sourceCode = R"(
@@ -1697,13 +1712,13 @@ BOOST_AUTO_TEST_CASE(value_for_constructor)
 {
 	char const* sourceCode = R"(
 		contract Helper {
-			string3 name;
+			bytes3 name;
 			bool flag;
-			function Helper(string3 x, bool f) {
+			function Helper(bytes3 x, bool f) {
 				name = x;
 				flag = f;
 			}
-			function getName() returns (string3 ret) { return name; }
+			function getName() returns (bytes3 ret) { return name; }
 			function getFlag() returns (bool ret) { return flag; }
 		}
 		contract Main {
@@ -1712,7 +1727,7 @@ BOOST_AUTO_TEST_CASE(value_for_constructor)
 				h = new Helper.value(10)("abc", true);
 			}
 			function getFlag() returns (bool ret) { return h.getFlag(); }
-			function getName() returns (string3 ret) { return h.getName(); }
+			function getName() returns (bytes3 ret) { return h.getName(); }
 			function getBalances() returns (uint me, uint them) { me = this.balance; them = h.balance;}
 		})";
 	compileAndRun(sourceCode, 22, "Main");
@@ -2090,13 +2105,13 @@ BOOST_AUTO_TEST_CASE(event)
 {
 	char const* sourceCode = R"(
 		contract ClientReceipt {
-			event Deposit(address indexed _from, hash indexed _id, uint _value);
-			function deposit(hash _id, bool _manually) {
+			event Deposit(address indexed _from, bytes32 indexed _id, uint _value);
+			function deposit(bytes32 _id, bool _manually) {
 				if (_manually) {
-					hash s = 0x50cb9fe53daa9737b786ab3646f04d0150dc50ef4e75f59509d83667ad5adb20;
-					log3(msg.value, s, hash32(msg.sender), _id);
+					bytes32 s = 0x19dacbf83c5de6658e14cbf7bcae5c15eca2eedecf1c66fbca928e4d351bea0f;
+					log3(bytes32(msg.value), s, bytes32(msg.sender), _id);
 				} else
-					Deposit(hash32(msg.sender), _id, msg.value);
+					Deposit(msg.sender, _id, msg.value);
 			}
 		}
 	)";
@@ -2105,12 +2120,12 @@ BOOST_AUTO_TEST_CASE(event)
 	u256 id(0x1234);
 	for (bool manually: {true, false})
 	{
-		callContractFunctionWithValue("deposit(hash256,bool)", value, id, manually);
+		callContractFunctionWithValue("deposit(bytes32,bool)", value, id, manually);
 		BOOST_REQUIRE_EQUAL(m_logs.size(), 1);
 		BOOST_CHECK_EQUAL(m_logs[0].address, m_contractAddress);
 		BOOST_CHECK_EQUAL(h256(m_logs[0].data), h256(u256(value)));
 		BOOST_REQUIRE_EQUAL(m_logs[0].topics.size(), 3);
-		BOOST_CHECK_EQUAL(m_logs[0].topics[0], dev::sha3(string("Deposit(address,hash256,uint256)")));
+		BOOST_CHECK_EQUAL(m_logs[0].topics[0], dev::sha3(string("Deposit(address,bytes32,uint256)")));
 		BOOST_CHECK_EQUAL(m_logs[0].topics[1], h256(m_sender));
 		BOOST_CHECK_EQUAL(m_logs[0].topics[2], h256(id));
 	}
@@ -2139,21 +2154,21 @@ BOOST_AUTO_TEST_CASE(event_lots_of_data)
 {
 	char const* sourceCode = R"(
 		contract ClientReceipt {
-			event Deposit(address _from, hash _id, uint _value, bool _flag);
-			function deposit(hash _id) {
-				Deposit(msg.sender, hash32(_id), msg.value, true);
+			event Deposit(address _from, bytes32 _id, uint _value, bool _flag);
+			function deposit(bytes32 _id) {
+				Deposit(msg.sender, _id, msg.value, true);
 			}
 		}
 	)";
 	compileAndRun(sourceCode);
 	u256 value(18);
 	u256 id(0x1234);
-	callContractFunctionWithValue("deposit(hash256)", value, id);
+	callContractFunctionWithValue("deposit(bytes32)", value, id);
 	BOOST_REQUIRE_EQUAL(m_logs.size(), 1);
 	BOOST_CHECK_EQUAL(m_logs[0].address, m_contractAddress);
 	BOOST_CHECK(m_logs[0].data == encodeArgs((u160)m_sender, id, value, true));
 	BOOST_REQUIRE_EQUAL(m_logs[0].topics.size(), 1);
-	BOOST_CHECK_EQUAL(m_logs[0].topics[0], dev::sha3(string("Deposit(address,hash256,uint256,bool)")));
+	BOOST_CHECK_EQUAL(m_logs[0].topics[0], dev::sha3(string("Deposit(address,bytes32,uint256,bool)")));
 }
 
 BOOST_AUTO_TEST_CASE(empty_name_input_parameter_with_named_one)
@@ -2187,7 +2202,7 @@ BOOST_AUTO_TEST_CASE(sha3_multiple_arguments)
 {
 	char const* sourceCode = R"(
 		contract c {
-			function foo(uint a, uint b, uint c) returns (hash d)
+			function foo(uint a, uint b, uint c) returns (bytes32 d)
 			{
 				d = sha3(a, b, c);
 			}
@@ -2205,7 +2220,7 @@ BOOST_AUTO_TEST_CASE(sha3_multiple_arguments_with_numeric_literals)
 {
 	char const* sourceCode = R"(
 		contract c {
-			function foo(uint a, uint16 b) returns (hash d)
+			function foo(uint a, uint16 b) returns (bytes32 d)
 			{
 				d = sha3(a, b, 145);
 			}
@@ -2223,11 +2238,11 @@ BOOST_AUTO_TEST_CASE(sha3_multiple_arguments_with_string_literals)
 {
 	char const* sourceCode = R"(
 		contract c {
-			function foo() returns (hash d)
+			function foo() returns (bytes32 d)
 			{
 				d = sha3("foo");
 			}
-			function bar(uint a, uint16 b) returns (hash d)
+			function bar(uint a, uint16 b) returns (bytes32 d)
 			{
 				d = sha3(a, b, 145, "foo");
 			}
@@ -2254,7 +2269,7 @@ BOOST_AUTO_TEST_CASE(generic_call)
 			contract sender {
 				function doSend(address rec) returns (uint d)
 				{
-					string4 signature = string4(string32(sha3("receive(uint256)")));
+					bytes4 signature = bytes4(bytes32(sha3("receive(uint256)")));
 					rec.call.value(2)(signature, 23);
 					return receiver(rec).received();
 				}
@@ -2290,7 +2305,7 @@ BOOST_AUTO_TEST_CASE(bytes_from_calldata_to_memory)
 {
 	char const* sourceCode = R"(
 		contract C {
-			function() returns (hash) {
+			function() returns (bytes32) {
 				return sha3("abc", msg.data);
 			}
 		}
@@ -3181,7 +3196,6 @@ BOOST_AUTO_TEST_CASE(pass_dynamic_arguments_to_the_base_base_with_gap)
 	BOOST_CHECK(callContractFunction("m_i()") == encodeArgs(4));
 }
 
-
 BOOST_AUTO_TEST_SUITE_END()
 
 }
diff --git a/test/SolidityInterface.cpp b/test/SolidityInterface.cpp
index ecab64c8c..48e2fd7aa 100644
--- a/test/SolidityInterface.cpp
+++ b/test/SolidityInterface.cpp
@@ -84,10 +84,10 @@ BOOST_AUTO_TEST_CASE(single_function)
 BOOST_AUTO_TEST_CASE(single_constant_function)
 {
 	ContractDefinition const& contract = checkInterface(
-			"contract test { function f(uint a) constant returns(hash8 x) { 1==2; } }");
+			"contract test { function f(uint a) constant returns(bytes1 x) { 1==2; } }");
 	BOOST_REQUIRE_EQUAL(1, contract.getDefinedFunctions().size());
 	BOOST_CHECK_EQUAL(getSourcePart(*contract.getDefinedFunctions().front()),
-					  "function f(uint256 a)constant returns(hash8 x){}");
+					  "function f(uint256 a)constant returns(bytes1 x){}");
 }
 
 BOOST_AUTO_TEST_CASE(multiple_functions)
@@ -128,15 +128,15 @@ BOOST_AUTO_TEST_CASE(inheritance)
 	char const* sourceCode =
 	"	contract Base { \n"
 	"		function baseFunction(uint p) returns (uint i) { return p; } \n"
-	"		event baseEvent(string32 indexed evtArgBase); \n"
+	"		event baseEvent(bytes32 indexed evtArgBase); \n"
 	"	} \n"
 	"	contract Derived is Base { \n"
-	"		function derivedFunction(string32 p) returns (string32 i) { return p; } \n"
+	"		function derivedFunction(bytes32 p) returns (bytes32 i) { return p; } \n"
 	"		event derivedEvent(uint indexed evtArgDerived); \n"
 	"	}";
 	ContractDefinition const& contract = checkInterface(sourceCode);
 	set<string> expectedFunctions({"function baseFunction(uint256 p)returns(uint256 i){}",
-								   "function derivedFunction(string32 p)returns(string32 i){}"});
+								   "function derivedFunction(bytes32 p)returns(bytes32 i){}"});
 	BOOST_REQUIRE_EQUAL(2, contract.getDefinedFunctions().size());
 	BOOST_CHECK(expectedFunctions == set<string>({getSourcePart(*contract.getDefinedFunctions().at(0)),
 												  getSourcePart(*contract.getDefinedFunctions().at(1))}));
diff --git a/test/SolidityNameAndTypeResolution.cpp b/test/SolidityNameAndTypeResolution.cpp
index c3a4a3377..a310800f7 100644
--- a/test/SolidityNameAndTypeResolution.cpp
+++ b/test/SolidityNameAndTypeResolution.cpp
@@ -75,6 +75,7 @@ static FunctionTypePointer const& retrieveFunctionBySignature(ContractDefinition
 	FixedHash<4> hash(dev::sha3(_signature));
 	return _contract->getInterfaceFunctions()[hash];
 }
+
 }
 
 BOOST_AUTO_TEST_SUITE(SolidityNameAndTypeResolution)
@@ -353,7 +354,7 @@ BOOST_AUTO_TEST_CASE(function_canonical_signature)
 					   "    ret = arg1 + arg2;\n"
 					   "  }\n"
 					   "}\n";
-	BOOST_CHECK_NO_THROW(sourceUnit = parseTextAndResolveNames(text));
+	ETH_TEST_REQUIRE_NO_THROW(sourceUnit = parseTextAndResolveNames(text), "Parsing and name Resolving failed");
 	for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes())
 		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
 		{
@@ -366,16 +367,16 @@ BOOST_AUTO_TEST_CASE(function_canonical_signature_type_aliases)
 {
 	ASTPointer<SourceUnit> sourceUnit;
 	char const* text = "contract Test {\n"
-					   "  function boo(uint arg1, hash arg2, address arg3) returns (uint ret) {\n"
+					   "  function boo(uint arg1, bytes32 arg2, address arg3) returns (uint ret) {\n"
 					   "    ret = 5;\n"
 					   "  }\n"
 					   "}\n";
-	BOOST_CHECK_NO_THROW(sourceUnit = parseTextAndResolveNames(text));
+	ETH_TEST_REQUIRE_NO_THROW(sourceUnit = parseTextAndResolveNames(text), "Parsing and name Resolving failed");
 	for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes())
 		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
 		{
 			auto functions = contract->getDefinedFunctions();
-			BOOST_CHECK_EQUAL("boo(uint256,hash256,address)", functions[0]->getCanonicalSignature());
+			BOOST_CHECK_EQUAL("boo(uint256,bytes32,address)", functions[0]->getCanonicalSignature());
 		}
 }
 
@@ -537,7 +538,7 @@ BOOST_AUTO_TEST_CASE(function_modifier_invocation)
 		contract B {
 			function f() mod1(2, true) mod2("0123456") { }
 			modifier mod1(uint a, bool b) { if (b) _ }
-			modifier mod2(string7 a) { while (a == "1234567") _ }
+			modifier mod2(bytes7 a) { while (a == "1234567") _ }
 		}
 	)";
 	ETH_TEST_CHECK_NO_THROW(parseTextAndResolveNames(text), "Parsing and Name Resolving Failed");
@@ -558,9 +559,9 @@ BOOST_AUTO_TEST_CASE(function_modifier_invocation_parameters)
 {
 	char const* text = R"(
 		contract B {
-			function f(uint8 a) mod1(a, true) mod2(r) returns (string7 r) { }
+			function f(uint8 a) mod1(a, true) mod2(r) returns (bytes7 r) { }
 			modifier mod1(uint a, bool b) { if (b) _ }
-			modifier mod2(string7 a) { while (a == "1234567") _ }
+			modifier mod2(bytes7 a) { while (a == "1234567") _ }
 		}
 	)";
 	ETH_TEST_CHECK_NO_THROW(parseTextAndResolveNames(text), "Parsing and Name Resolving Failed");
@@ -631,8 +632,8 @@ BOOST_AUTO_TEST_CASE(state_variable_accessors)
 					   "    uint64(2);\n"
 					   "  }\n"
 					   "uint256 public foo;\n"
-					   "mapping(uint=>string4) public map;\n"
-					   "mapping(uint=>mapping(uint=>string4)) public multiple_map;\n"
+					   "mapping(uint=>bytes4) public map;\n"
+					   "mapping(uint=>mapping(uint=>bytes4)) public multiple_map;\n"
 					   "}\n";
 
 	ASTPointer<SourceUnit> source;
@@ -650,7 +651,7 @@ BOOST_AUTO_TEST_CASE(state_variable_accessors)
 	auto params = function->getParameterTypeNames();
 	BOOST_CHECK_EQUAL(params.at(0), "uint256");
 	returnParams = function->getReturnParameterTypeNames();
-	BOOST_CHECK_EQUAL(returnParams.at(0), "string4");
+	BOOST_CHECK_EQUAL(returnParams.at(0), "bytes4");
 	BOOST_CHECK(function->isConstant());
 
 	function = retrieveFunctionBySignature(contract, "multiple_map(uint256,uint256)");
@@ -659,7 +660,7 @@ BOOST_AUTO_TEST_CASE(state_variable_accessors)
 	BOOST_CHECK_EQUAL(params.at(0), "uint256");
 	BOOST_CHECK_EQUAL(params.at(1), "uint256");
 	returnParams = function->getReturnParameterTypeNames();
-	BOOST_CHECK_EQUAL(returnParams.at(0), "string4");
+	BOOST_CHECK_EQUAL(returnParams.at(0), "bytes4");
 	BOOST_CHECK(function->isConstant());
 }
 
@@ -800,7 +801,7 @@ BOOST_AUTO_TEST_CASE(event)
 {
 	char const* text = R"(
 		contract c {
-			event e(uint indexed a, string3 indexed s, bool indexed b);
+			event e(uint indexed a, bytes3 indexed s, bool indexed b);
 			function f() { e(2, "abc", true); }
 		})";
 	ETH_TEST_CHECK_NO_THROW(parseTextAndResolveNames(text), "Parsing and Name Resolving Failed");
@@ -810,7 +811,7 @@ BOOST_AUTO_TEST_CASE(event_too_many_indexed)
 {
 	char const* text = R"(
 		contract c {
-			event e(uint indexed a, string3 indexed b, bool indexed c, uint indexed d);
+			event e(uint indexed a, bytes3 indexed b, bool indexed c, uint indexed d);
 			function f() { e(2, "abc", true); }
 		})";
 	BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
@@ -820,7 +821,7 @@ BOOST_AUTO_TEST_CASE(event_call)
 {
 	char const* text = R"(
 		contract c {
-			event e(uint a, string3 indexed s, bool indexed b);
+			event e(uint a, bytes3 indexed s, bool indexed b);
 			function f() { e(2, "abc", true); }
 		})";
 	ETH_TEST_CHECK_NO_THROW(parseTextAndResolveNames(text), "Parsing and Name Resolving Failed");
@@ -830,7 +831,7 @@ BOOST_AUTO_TEST_CASE(event_inheritance)
 {
 	char const* text = R"(
 		contract base {
-			event e(uint a, string3 indexed s, bool indexed b);
+			event e(uint a, bytes3 indexed s, bool indexed b);
 		}
 		contract c is base {
 			function f() { e(2, "abc", true); }
@@ -1287,6 +1288,122 @@ BOOST_AUTO_TEST_CASE(storage_variable_initialization_with_incorrect_type_string)
 	BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
 }
 
+BOOST_AUTO_TEST_CASE(test_fromElementaryTypeName)
+{
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int) == *make_shared<IntegerType>(256, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int8) == *make_shared<IntegerType>(8, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int16) == *make_shared<IntegerType>(16, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int24) == *make_shared<IntegerType>(24, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int32) == *make_shared<IntegerType>(32, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int40) == *make_shared<IntegerType>(40, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int48) == *make_shared<IntegerType>(48, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int56) == *make_shared<IntegerType>(56, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int64) == *make_shared<IntegerType>(64, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int72) == *make_shared<IntegerType>(72, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int80) == *make_shared<IntegerType>(80, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int88) == *make_shared<IntegerType>(88, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int96) == *make_shared<IntegerType>(96, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int104) == *make_shared<IntegerType>(104, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int112) == *make_shared<IntegerType>(112, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int120) == *make_shared<IntegerType>(120, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int128) == *make_shared<IntegerType>(128, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int136) == *make_shared<IntegerType>(136, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int144) == *make_shared<IntegerType>(144, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int152) == *make_shared<IntegerType>(152, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int160) == *make_shared<IntegerType>(160, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int168) == *make_shared<IntegerType>(168, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int176) == *make_shared<IntegerType>(176, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int184) == *make_shared<IntegerType>(184, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int192) == *make_shared<IntegerType>(192, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int200) == *make_shared<IntegerType>(200, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int208) == *make_shared<IntegerType>(208, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int216) == *make_shared<IntegerType>(216, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int224) == *make_shared<IntegerType>(224, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int232) == *make_shared<IntegerType>(232, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int240) == *make_shared<IntegerType>(240, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int248) == *make_shared<IntegerType>(248, IntegerType::Modifier::Signed));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Int256) == *make_shared<IntegerType>(256, IntegerType::Modifier::Signed));
+
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt) == *make_shared<IntegerType>(256, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt8) == *make_shared<IntegerType>(8, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt16) == *make_shared<IntegerType>(16, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt24) == *make_shared<IntegerType>(24, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt32) == *make_shared<IntegerType>(32, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt40) == *make_shared<IntegerType>(40, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt48) == *make_shared<IntegerType>(48, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt56) == *make_shared<IntegerType>(56, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt64) == *make_shared<IntegerType>(64, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt72) == *make_shared<IntegerType>(72, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt80) == *make_shared<IntegerType>(80, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt88) == *make_shared<IntegerType>(88, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt96) == *make_shared<IntegerType>(96, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt104) == *make_shared<IntegerType>(104, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt112) == *make_shared<IntegerType>(112, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt120) == *make_shared<IntegerType>(120, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt128) == *make_shared<IntegerType>(128, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt136) == *make_shared<IntegerType>(136, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt144) == *make_shared<IntegerType>(144, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt152) == *make_shared<IntegerType>(152, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt160) == *make_shared<IntegerType>(160, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt168) == *make_shared<IntegerType>(168, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt176) == *make_shared<IntegerType>(176, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt184) == *make_shared<IntegerType>(184, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt192) == *make_shared<IntegerType>(192, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt200) == *make_shared<IntegerType>(200, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt208) == *make_shared<IntegerType>(208, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt216) == *make_shared<IntegerType>(216, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt224) == *make_shared<IntegerType>(224, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt232) == *make_shared<IntegerType>(232, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt240) == *make_shared<IntegerType>(240, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt248) == *make_shared<IntegerType>(248, IntegerType::Modifier::Unsigned));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::UInt256) == *make_shared<IntegerType>(256, IntegerType::Modifier::Unsigned));
+
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Byte) == *make_shared<FixedBytesType>(1));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes0) == *make_shared<FixedBytesType>(0));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes1) == *make_shared<FixedBytesType>(1));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes2) == *make_shared<FixedBytesType>(2));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes3) == *make_shared<FixedBytesType>(3));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes4) == *make_shared<FixedBytesType>(4));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes5) == *make_shared<FixedBytesType>(5));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes6) == *make_shared<FixedBytesType>(6));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes7) == *make_shared<FixedBytesType>(7));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes8) == *make_shared<FixedBytesType>(8));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes9) == *make_shared<FixedBytesType>(9));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes10) == *make_shared<FixedBytesType>(10));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes11) == *make_shared<FixedBytesType>(11));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes12) == *make_shared<FixedBytesType>(12));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes13) == *make_shared<FixedBytesType>(13));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes14) == *make_shared<FixedBytesType>(14));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes15) == *make_shared<FixedBytesType>(15));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes16) == *make_shared<FixedBytesType>(16));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes17) == *make_shared<FixedBytesType>(17));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes18) == *make_shared<FixedBytesType>(18));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes19) == *make_shared<FixedBytesType>(19));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes20) == *make_shared<FixedBytesType>(20));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes21) == *make_shared<FixedBytesType>(21));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes22) == *make_shared<FixedBytesType>(22));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes23) == *make_shared<FixedBytesType>(23));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes24) == *make_shared<FixedBytesType>(24));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes25) == *make_shared<FixedBytesType>(25));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes26) == *make_shared<FixedBytesType>(26));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes27) == *make_shared<FixedBytesType>(27));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes28) == *make_shared<FixedBytesType>(28));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes29) == *make_shared<FixedBytesType>(29));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes30) == *make_shared<FixedBytesType>(30));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes31) == *make_shared<FixedBytesType>(31));
+	BOOST_CHECK(*Type::fromElementaryTypeName(Token::Bytes32) == *make_shared<FixedBytesType>(32));
+}
+
+BOOST_AUTO_TEST_CASE(test_byte_is_alias_of_byte1)
+{
+	char const* text = R"(
+		contract c {
+			bytes arr;
+			function f() { byte a = arr[0];}
+		})";
+	ETH_TEST_REQUIRE_NO_THROW(parseTextAndResolveNames(text), "Type resolving failed");
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }
diff --git a/test/SolidityParser.cpp b/test/SolidityParser.cpp
index 88b86e638..2f5d06ef6 100644
--- a/test/SolidityParser.cpp
+++ b/test/SolidityParser.cpp
@@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE(empty_function)
 {
 	char const* text = "contract test {\n"
 					   "  uint256 stateVar;\n"
-					   "  function functionName(hash160 arg1, address addr) constant\n"
+					   "  function functionName(bytes20 arg1, address addr) constant\n"
 					   "    returns (int id)\n"
 					   "  { }\n"
 					   "}\n";
@@ -103,7 +103,7 @@ BOOST_AUTO_TEST_CASE(single_function_param)
 {
 	char const* text = "contract test {\n"
 					   "  uint256 stateVar;\n"
-					   "  function functionName(hash hashin) returns (hash hashout) {}\n"
+					   "  function functionName(bytes32 input) returns (bytes32 out) {}\n"
 					   "}\n";
 	ETH_TEST_CHECK_NO_THROW(parseText(text), "Parsing failed.");
 }
@@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE(function_natspec_documentation)
 	char const* text = "contract test {\n"
 					   "  uint256 stateVar;\n"
 					   "  /// This is a test function\n"
-					   "  function functionName(hash hashin) returns (hash hashout) {}\n"
+					   "  function functionName(bytes32 input) returns (bytes32 out) {}\n"
 					   "}\n";
 	ETH_TEST_REQUIRE_NO_THROW(contract = parseText(text), "Parsing failed");
 	auto functions = contract->getDefinedFunctions();
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE(function_normal_comments)
 	char const* text = "contract test {\n"
 					   "  uint256 stateVar;\n"
 					   "  // We won't see this comment\n"
-					   "  function functionName(hash hashin) returns (hash hashout) {}\n"
+					   "  function functionName(bytes32 input) returns (bytes32 out) {}\n"
 					   "}\n";
 	ETH_TEST_REQUIRE_NO_THROW(contract = parseText(text), "Parsing failed");
 	auto functions = contract->getDefinedFunctions();
@@ -164,13 +164,13 @@ BOOST_AUTO_TEST_CASE(multiple_functions_natspec_documentation)
 	char const* text = "contract test {\n"
 					   "  uint256 stateVar;\n"
 					   "  /// This is test function 1\n"
-					   "  function functionName1(hash hashin) returns (hash hashout) {}\n"
+					   "  function functionName1(bytes32 input) returns (bytes32 out) {}\n"
 					   "  /// This is test function 2\n"
-					   "  function functionName2(hash hashin) returns (hash hashout) {}\n"
+					   "  function functionName2(bytes32 input) returns (bytes32 out) {}\n"
 					   "  // nothing to see here\n"
-					   "  function functionName3(hash hashin) returns (hash hashout) {}\n"
+					   "  function functionName3(bytes32 input) returns (bytes32 out) {}\n"
 					   "  /// This is test function 4\n"
-					   "  function functionName4(hash hashin) returns (hash hashout) {}\n"
+					   "  function functionName4(bytes32 input) returns (bytes32 out) {}\n"
 					   "}\n";
 	ETH_TEST_REQUIRE_NO_THROW(contract = parseText(text), "Parsing failed");
 	auto functions = contract->getDefinedFunctions();
@@ -197,7 +197,7 @@ BOOST_AUTO_TEST_CASE(multiline_function_documentation)
 					   "  uint256 stateVar;\n"
 					   "  /// This is a test function\n"
 					   "  /// and it has 2 lines\n"
-					   "  function functionName1(hash hashin) returns (hash hashout) {}\n"
+					   "  function functionName1(bytes32 input) returns (bytes32 out) {}\n"
 					   "}\n";
 	ETH_TEST_REQUIRE_NO_THROW(contract = parseText(text), "Parsing failed");
 	auto functions = contract->getDefinedFunctions();
@@ -217,12 +217,12 @@ BOOST_AUTO_TEST_CASE(natspec_comment_in_function_body)
 					   "    var b;\n"
 					   "    /// I should not interfere with actual natspec comments\n"
 					   "    uint256 c;\n"
-					   "    mapping(address=>hash) d;\n"
-					   "    string name = \"Solidity\";"
+					   "    mapping(address=>bytes32) d;\n"
+					   "    bytes7 name = \"Solidity\";"
 					   "  }\n"
 					   "  /// This is a test function\n"
 					   "  /// and it has 2 lines\n"
-					   "  function fun(hash hashin) returns (hash hashout) {}\n"
+					   "  function fun(bytes32 input) returns (bytes32 out) {}\n"
 					   "}\n";
 	ETH_TEST_REQUIRE_NO_THROW(contract = parseText(text), "Parsing failed");
 	auto functions = contract->getDefinedFunctions();
@@ -246,8 +246,8 @@ BOOST_AUTO_TEST_CASE(natspec_docstring_between_keyword_and_signature)
 					   "    var b;\n"
 					   "    /// I should not interfere with actual natspec comments\n"
 					   "    uint256 c;\n"
-					   "    mapping(address=>hash) d;\n"
-					   "    string name = \"Solidity\";"
+					   "    mapping(address=>bytes32) d;\n"
+					   "    bytes7 name = \"Solidity\";"
 					   "  }\n"
 					   "}\n";
 	ETH_TEST_REQUIRE_NO_THROW(contract = parseText(text), "Parsing failed");
@@ -269,8 +269,8 @@ BOOST_AUTO_TEST_CASE(natspec_docstring_after_signature)
 					   "    var b;\n"
 					   "    /// I should not interfere with actual natspec comments\n"
 					   "    uint256 c;\n"
-					   "    mapping(address=>hash) d;\n"
-					   "    string name = \"Solidity\";"
+					   "    mapping(address=>bytes32) d;\n"
+					   "    bytes7 name = \"Solidity\";"
 					   "  }\n"
 					   "}\n";
 	ETH_TEST_REQUIRE_NO_THROW(contract = parseText(text), "Parsing failed");
@@ -296,7 +296,7 @@ BOOST_AUTO_TEST_CASE(struct_definition)
 BOOST_AUTO_TEST_CASE(mapping)
 {
 	char const* text = "contract test {\n"
-					   "  mapping(address => string) names;\n"
+					   "  mapping(address => bytes32) names;\n"
 					   "}\n";
 	ETH_TEST_CHECK_NO_THROW(parseText(text), "Parsing failed");
 }
@@ -307,7 +307,7 @@ BOOST_AUTO_TEST_CASE(mapping_in_struct)
 					   "  struct test_struct {\n"
 					   "    address addr;\n"
 					   "    uint256 count;\n"
-					   "    mapping(hash => test_struct) self_reference;\n"
+					   "    mapping(bytes32 => test_struct) self_reference;\n"
 					   "  }\n"
 					   "}\n";
 	ETH_TEST_CHECK_NO_THROW(parseText(text), "Parsing failed");
@@ -318,7 +318,7 @@ BOOST_AUTO_TEST_CASE(mapping_to_mapping_in_struct)
 	char const* text = "contract test {\n"
 					   "  struct test_struct {\n"
 					   "    address addr;\n"
-					   "    mapping (uint64 => mapping (hash => uint)) complex_mapping;\n"
+					   "    mapping (uint64 => mapping (bytes32 => uint)) complex_mapping;\n"
 					   "  }\n"
 					   "}\n";
 	ETH_TEST_CHECK_NO_THROW(parseText(text), "Parsing failed");
@@ -330,7 +330,7 @@ BOOST_AUTO_TEST_CASE(variable_definition)
 					   "  function fun(uint256 a) {\n"
 					   "    var b;\n"
 					   "    uint256 c;\n"
-					   "    mapping(address=>hash) d;\n"
+					   "    mapping(address=>bytes32) d;\n"
 					   "    customtype varname;\n"
 					   "  }\n"
 					   "}\n";
@@ -343,8 +343,8 @@ BOOST_AUTO_TEST_CASE(variable_definition_with_initialization)
 					   "  function fun(uint256 a) {\n"
 					   "    var b = 2;\n"
 					   "    uint256 c = 0x87;\n"
-					   "    mapping(address=>hash) d;\n"
-					   "    string name = \"Solidity\";"
+					   "    mapping(address=>bytes32) d;\n"
+					   "    bytes7 name = \"Solidity\";"
 					   "    customtype varname;\n"
 					   "  }\n"
 					   "}\n";
@@ -366,7 +366,7 @@ BOOST_AUTO_TEST_CASE(variable_definition_in_mapping)
 	char const* text = R"(
 		contract test {
 			function fun() {
-				mapping(var=>hash) d;
+				mapping(var=>bytes32) d;
 			}
 		}
 	)";
@@ -662,7 +662,7 @@ BOOST_AUTO_TEST_CASE(event_arguments)
 {
 	char const* text = R"(
 		contract c {
-			event e(uint a, string32 s);
+			event e(uint a, bytes32 s);
 		})";
 	ETH_TEST_CHECK_NO_THROW(parseText(text), "Parsing failed");
 }
@@ -671,7 +671,7 @@ BOOST_AUTO_TEST_CASE(event_arguments_indexed)
 {
 	char const* text = R"(
 		contract c {
-			event e(uint a, string32 indexed s, bool indexed b);
+			event e(uint a, bytes32 indexed s, bool indexed b);
 		})";
 	ETH_TEST_CHECK_NO_THROW(parseText(text), "Parsing failed");
 }
@@ -799,7 +799,7 @@ BOOST_AUTO_TEST_CASE(arrays_in_events)
 {
 	char const* text = R"(
 		contract c {
-			event e(uint[10] a, string7[8] indexed b, c[3] x);
+			event e(uint[10] a, bytes7[8] indexed b, c[3] x);
 		})";
 	ETH_TEST_CHECK_NO_THROW(parseText(text), "Parsing failed");
 }
diff --git a/test/TestHelper.cpp b/test/TestHelper.cpp
index 9ac64107d..ddc929e4e 100644
--- a/test/TestHelper.cpp
+++ b/test/TestHelper.cpp
@@ -84,12 +84,12 @@ ImportTest::ImportTest(json_spirit::mObject& _o, bool isFiller) : m_statePre(Add
 
 void ImportTest::importEnv(json_spirit::mObject& _o)
 {
-	BOOST_REQUIRE(_o.count("previousHash") > 0);
-	BOOST_REQUIRE(_o.count("currentGasLimit") > 0);
-	BOOST_REQUIRE(_o.count("currentDifficulty") > 0);
-	BOOST_REQUIRE(_o.count("currentTimestamp") > 0);
-	BOOST_REQUIRE(_o.count("currentCoinbase") > 0);
-	BOOST_REQUIRE(_o.count("currentNumber") > 0);
+	assert(_o.count("previousHash") > 0);
+	assert(_o.count("currentGasLimit") > 0);
+	assert(_o.count("currentDifficulty") > 0);
+	assert(_o.count("currentTimestamp") > 0);
+	assert(_o.count("currentCoinbase") > 0);
+	assert(_o.count("currentNumber") > 0);
 
 	m_environment.previousBlock.hash = h256(_o["previousHash"].get_str());
 	m_environment.currentBlock.number = toInt(_o["currentNumber"]);
@@ -108,10 +108,10 @@ void ImportTest::importState(json_spirit::mObject& _o, State& _state)
 	{
 		json_spirit::mObject o = i.second.get_obj();
 
-		BOOST_REQUIRE(o.count("balance") > 0);
-		BOOST_REQUIRE(o.count("nonce") > 0);
-		BOOST_REQUIRE(o.count("storage") > 0);
-		BOOST_REQUIRE(o.count("code") > 0);
+		assert(o.count("balance") > 0);
+		assert(o.count("nonce") > 0);
+		assert(o.count("storage") > 0);
+		assert(o.count("code") > 0);
 
 		if (bigint(o["balance"].get_str()) >= c_max256plus1)
 			BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("State 'balance' is equal or greater than 2**256") );
@@ -144,12 +144,12 @@ void ImportTest::importTransaction(json_spirit::mObject& _o)
 {	
 	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);
+		assert(_o.count("nonce") > 0);
+		assert(_o.count("gasPrice") > 0);
+		assert(_o.count("gasLimit") > 0);
+		assert(_o.count("to") > 0);
+		assert(_o.count("value") > 0);
+		assert(_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") );
@@ -439,8 +439,6 @@ void userDefinedTest(string testTypeFlag, std::function<void(json_spirit::mValue
 			}
 			g_logVerbosity = currentVerbosity;
 		}
-		else
-			continue;
 	}
 }
 
@@ -449,32 +447,27 @@ void executeTests(const string& _name, const string& _testPathAppendix, std::fun
 	string testPath = getTestPath();
 	testPath += _testPathAppendix;
 
-	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
+	if (Options::get().fillTests)
 	{
-		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == "--filltests")
+		try
 		{
-			try
-			{
-				cnote << "Populating tests...";
-				json_spirit::mValue v;
-				boost::filesystem::path p(__FILE__);
-				boost::filesystem::path dir = p.parent_path();
-				string s = asString(dev::contents(dir.string() + "/" + _name + "Filler.json"));
-				BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + dir.string() + "/" + _name + "Filler.json is empty.");
-				json_spirit::read_string(s, v);
-				doTests(v, true);
-				writeFile(testPath + "/" + _name + ".json", asBytes(json_spirit::write_string(v, true)));
-			}
-			catch (Exception const& _e)
-			{
-				BOOST_ERROR("Failed filling test with Exception: " << diagnostic_information(_e));
-			}
-			catch (std::exception const& _e)
-			{
-				BOOST_ERROR("Failed filling test with Exception: " << _e.what());
-			}
-			break;
+			cnote << "Populating tests...";
+			json_spirit::mValue v;
+			boost::filesystem::path p(__FILE__);
+			boost::filesystem::path dir = p.parent_path();
+			string s = asString(dev::contents(dir.string() + "/" + _name + "Filler.json"));
+			BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + dir.string() + "/" + _name + "Filler.json is empty.");
+			json_spirit::read_string(s, v);
+			doTests(v, true);
+			writeFile(testPath + "/" + _name + ".json", asBytes(json_spirit::write_string(v, true)));
+		}
+		catch (Exception const& _e)
+		{
+			BOOST_ERROR("Failed filling test with Exception: " << diagnostic_information(_e));
+		}
+		catch (std::exception const& _e)
+		{
+			BOOST_ERROR("Failed filling test with Exception: " << _e.what());
 		}
 	}
 
@@ -541,21 +534,50 @@ RLPStream createRLPStreamFromTransactionFields(json_spirit::mObject& _tObj)
 	return rlpStream;
 }
 
-void processCommandLineOptions()
+Options::Options()
 {
 	auto argc = boost::unit_test::framework::master_test_suite().argc;
 	auto argv = boost::unit_test::framework::master_test_suite().argv;
 
-	for (auto i =  0; i < argc; ++i)
+	for (auto i = 0; i < argc; ++i)
 	{
-		if (std::string(argv[i]) == "--jit")
+		auto arg = std::string{argv[i]};
+		if (arg == "--jit")
 		{
+			jit = true;
 			eth::VMFactory::setKind(eth::VMKind::JIT);
-			break;
+		}
+		else if (arg == "--vmtrace")
+			vmtrace = true;
+		else if (arg == "--filltests")
+			fillTests = true;
+		else if (arg == "--performance")
+			performance = true;
+		else if (arg == "--quadratic")
+			quadratic = true;
+		else if (arg == "--memory")
+			memory = true;
+		else if (arg == "--inputlimits")
+			inputLimits = true;
+		else if (arg == "--bigdata")
+			bigData = true;
+		else if (arg == "--all")
+		{
+			performance = true;
+			quadratic = true;
+			memory = true;
+			inputLimits = true;
+			bigData = true;
 		}
 	}
 }
 
+Options const& Options::get()
+{
+	static Options instance;
+	return instance;
+}
+
 LastHashes lastHashes(u256 _currentBlockNumber)
 {
 	LastHashes ret;
diff --git a/test/TestHelper.h b/test/TestHelper.h
index d378848a2..9efed0fa6 100644
--- a/test/TestHelper.h
+++ b/test/TestHelper.h
@@ -141,7 +141,6 @@ void executeTests(const std::string& _name, const std::string& _testPathAppendix
 std::string getTestPath();
 void userDefinedTest(std::string testTypeFlag, std::function<void(json_spirit::mValue&, bool)> doTests);
 RLPStream createRLPStreamFromTransactionFields(json_spirit::mObject& _tObj);
-void processCommandLineOptions();
 eth::LastHashes lastHashes(u256 _currentBlockNumber);
 json_spirit::mObject fillJsonWithState(eth::State _state);
 
@@ -158,5 +157,31 @@ void checkAddresses(mapType& _expectedAddrs, mapType& _resultAddrs)
 	BOOST_CHECK(_expectedAddrs == _resultAddrs);
 }
 
+class Options
+{
+public:
+	bool jit = false;		///< Use JIT
+	bool vmtrace = false;	///< Create EVM execution tracer // TODO: Link with log verbosity?
+	bool showTimes = false;	///< Print test groups execution times
+	bool fillTests = false; ///< Create JSON test files from execution results
+
+	/// Test selection
+	/// @{
+	bool performance = false;
+	bool quadratic = false;
+	bool memory = false;
+	bool inputLimits = false;
+	bool bigData = false;
+	/// @}
+
+	/// Get reference to options
+	/// The first time used, options are parsed
+	static Options const& get();
+
+private:
+	Options();
+	Options(Options const&) = delete;
+};
+
 }
 }
diff --git a/test/bcBlockChainTestFiller.json b/test/bcBlockChainTestFiller.json
index b149f5938..ed70a5296 100644
--- a/test/bcBlockChainTestFiller.json
+++ b/test/bcBlockChainTestFiller.json
@@ -13,7 +13,6 @@
             "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
             "timestamp" : "0x54c98c81",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
diff --git a/test/bcInvalidHeaderTestFiller.json b/test/bcInvalidHeaderTestFiller.json
index 39a91a583..da3d13163 100644
--- a/test/bcInvalidHeaderTestFiller.json
+++ b/test/bcInvalidHeaderTestFiller.json
@@ -8,7 +8,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -64,7 +63,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -120,7 +118,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -175,7 +172,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -230,7 +226,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -285,7 +280,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -341,7 +335,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -396,7 +389,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -451,7 +443,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -506,7 +497,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -561,7 +551,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -616,7 +605,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -671,7 +659,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -726,7 +713,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
diff --git a/test/bcUncleTestFiller.json b/test/bcUncleTestFiller.json
index 73d1e5487..5fb466967 100644
--- a/test/bcUncleTestFiller.json
+++ b/test/bcUncleTestFiller.json
@@ -13,7 +13,6 @@
             "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
             "timestamp" : "0x54c98c81",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
@@ -68,7 +67,6 @@
                         "number" : "1",
                         "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
                         "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
                         "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
                         "timestamp" : "0x54c98c82",
                         "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -93,7 +91,6 @@
             "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
             "timestamp" : "0x54c98c81",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
@@ -163,7 +160,6 @@
                         "number" : "2",
                         "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
                         "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
                         "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
                         "timestamp" : "0x54c98c82",
                         "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -188,7 +184,6 @@
             "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
             "timestamp" : "0x54c98c81",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
@@ -258,7 +253,6 @@
                         "number" : "2",
                         "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
                         "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
                         "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
                         "timestamp" : "0x54c98c82",
                         "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -286,7 +280,6 @@
             "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
             "timestamp" : "0x54c98c81",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
@@ -356,7 +349,6 @@
                         "number" : "2",
                         "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
                         "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
                         "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
                         "timestamp" : "0x54c98c82",
                         "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -375,7 +367,6 @@
                         "number" : "2",
                         "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
                         "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
                         "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
                         "timestamp" : "0x54c98c82",
                         "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -400,7 +391,6 @@
             "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
             "timestamp" : "0x54c98c81",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
@@ -470,7 +460,6 @@
                         "number" : "2",
                         "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
                         "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
                         "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
                         "timestamp" : "0x54c98c82",
                         "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -489,7 +478,6 @@
                         "number" : "2",
                         "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
                         "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
                         "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
                         "timestamp" : "0x54c98c82",
                         "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -508,7 +496,6 @@
                         "number" : "2",
                         "parentHash" : "6134fc6b5d99ee03c4aab1592640f6f9dcbc850668d75d631aee34989b938fae",
                         "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                        "seedHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
                         "stateRoot" : "ff640b30d613c35dad43e3693329e1b1ee6350f989cf46a288025a1cbfdab9cd",
                         "timestamp" : "0x54c98c82",
                         "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
diff --git a/test/bcValidBlockTestFiller.json b/test/bcValidBlockTestFiller.json
index 14d4cfb2c..e184a0849 100644
--- a/test/bcValidBlockTestFiller.json
+++ b/test/bcValidBlockTestFiller.json
@@ -9,7 +9,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -56,7 +55,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -102,7 +100,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -148,7 +145,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -194,7 +190,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -249,7 +244,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -304,7 +298,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -356,7 +349,6 @@
             "gasLimit" : "125000",
             "gasUsed" : "100",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "seedHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0",
             "parentHash" : "0xefb4db878627027c81b3bb1c7dd3a18dae3914a49cdd24a3e40ab3bbfbb240c5",
diff --git a/test/blockchain.cpp b/test/blockchain.cpp
index eca08d09e..ac872c0f3 100644
--- a/test/blockchain.cpp
+++ b/test/blockchain.cpp
@@ -313,7 +313,6 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
 				BOOST_CHECK_MESSAGE(blockHeaderFromFields.timestamp == blockFromRlp.timestamp, "timestamp in given RLP not matching the block timestamp!");
 				BOOST_CHECK_MESSAGE(blockHeaderFromFields.extraData == blockFromRlp.extraData, "extraData in given RLP not matching the block extraData!");
 				BOOST_CHECK_MESSAGE(blockHeaderFromFields.mixHash == blockFromRlp.mixHash, "mixHash in given RLP not matching the block mixHash!");
-				BOOST_CHECK_MESSAGE(blockHeaderFromFields.seedHash == blockFromRlp.seedHash, "transactionsRoot in given RLP not matching the block transactionsRoot!");
 				BOOST_CHECK_MESSAGE(blockHeaderFromFields.nonce == blockFromRlp.nonce, "nonce in given RLP not matching the block nonce!");
 
 				BOOST_CHECK_MESSAGE(blockHeaderFromFields == blockFromRlp, "However, blockHeaderFromFields != blockFromRlp!");
@@ -387,7 +386,7 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
 					{
 						mObject uBlH = uBlHeaderObj.get_obj();
 						cout << "uBlH.size(): " << uBlH.size() << endl;
-						BOOST_REQUIRE(uBlH.size() == 17);
+						BOOST_REQUIRE(uBlH.size() == 16);
 						bytes uncleRLP = createBlockRLPFromFields(uBlH);
 						const RLP c_uRLP(uncleRLP);
 						BlockInfo uncleBlockHeader;
@@ -466,9 +465,6 @@ bytes createBlockRLPFromFields(mObject& _tObj)
 	if (_tObj.count("extraData"))
 		rlpStream << fromHex(_tObj["extraData"].get_str());
 
-	if (_tObj.count("seedHash"))
-		rlpStream << importByteArray(_tObj["seedHash"].get_str());
-
 	if (_tObj.count("mixHash"))
 		rlpStream << importByteArray(_tObj["mixHash"].get_str());
 
@@ -527,9 +523,6 @@ void overwriteBlockHeader(BlockInfo& _current_BlockHeader, mObject& _blObj)
 		if (_blObj["blockHeader"].get_obj().count("mixHash"))
 			tmp.mixHash = h256(_blObj["blockHeader"].get_obj()["mixHash"].get_str());
 
-		if (_blObj["blockHeader"].get_obj().count("seedHash"))
-			tmp.seedHash = h256(_blObj["blockHeader"].get_obj()["seedHash"].get_str());
-
 		// find new valid nonce
 
 		if (tmp != _current_BlockHeader)
@@ -540,7 +533,7 @@ void overwriteBlockHeader(BlockInfo& _current_BlockHeader, mObject& _blObj)
 			std::pair<MineInfo, Ethash::Proof> ret;
 			while (!ProofOfWork::verify(_current_BlockHeader))
 			{
-				ret = pow.mine(_current_BlockHeader, 1000, true, true); // tie(ret, blockFromFields.nonce)
+				ret = pow.mine(_current_BlockHeader, 1000, true, true);
 				Ethash::assignResult(ret.second, _current_BlockHeader);
 			}
 		}
@@ -587,7 +580,7 @@ void updatePoW(BlockInfo& _bi)
 	std::pair<MineInfo, Ethash::Proof> ret;
 	while (!ProofOfWork::verify(_bi))
 	{
-		ret = pow.mine(_bi, 10000, true, true); // tie(ret, blockFromFields.nonce)
+		ret = pow.mine(_bi, 10000, true, true);
 		Ethash::assignResult(ret.second, _bi);
 	}
 	_bi.hash = _bi.headerHash(WithNonce);
@@ -609,7 +602,6 @@ void writeBlockHeaderToJson(mObject& _o, const BlockInfo& _bi)
 	_o["timestamp"] = toString(_bi.timestamp);
 	_o["extraData"] ="0x" + toHex(_bi.extraData);
 	_o["mixHash"] = toString(_bi.mixHash);
-	_o["seedHash"] = toString(_bi.seedHash);
 	_o["nonce"] = toString(_bi.nonce);
 	_o["hash"] = toString(_bi.hash);
 }
diff --git a/test/checkRandomStateTest.cpp b/test/checkRandomStateTest.cpp
new file mode 100644
index 000000000..17e785f60
--- /dev/null
+++ b/test/checkRandomStateTest.cpp
@@ -0,0 +1,228 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file checkRandomStateTest.cpp
+ * @author Christoph Jentzsch <jentzsch.simulationsoftware@gmail.com>
+ * @date 2015
+ * Check a random test and return 0/1 for success or failure. To be used for efficiency in the random test simulation.
+ */
+
+#include <libdevcore/Common.h>
+#include <libdevcore/Exceptions.h>
+#include <libdevcore/Log.h>
+#include <libevm/VMFactory.h>
+#include "TestHelper.h"
+#include "vm.h"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+
+using namespace std;
+using namespace json_spirit;
+using namespace dev::test;
+using namespace dev;
+
+bool doStateTest(mValue& _v);
+
+int main(int argc, char *argv[])
+{
+	g_logVerbosity = 0;
+	bool ret = false;
+
+	try
+	{
+		mValue v;
+		string s;
+		for (int i = 1; i < argc; ++i)
+			s += argv[i];
+		if (asserts(s.length() > 0))
+		{
+			cout << "Content of argument is empty\n";
+			return 1;
+		}
+		read_string(s, v);
+		ret = doStateTest(v);
+	}
+	catch (Exception const& _e)
+	{
+		cout << "Failed test with Exception: " << diagnostic_information(_e) << endl;
+		ret = false;
+	}
+	catch (std::exception const& _e)
+	{
+		cout << "Failed test with Exception: " << _e.what() << endl;
+		ret = false;
+	}
+	return ret;
+}
+
+bool doStateTest(mValue& _v)
+{
+	eth::VMFactory::setKind(eth::VMKind::JIT);
+
+	for (auto& i: _v.get_obj())
+	{
+		mObject& o = i.second.get_obj();
+
+		assert(o.count("env") > 0);
+		assert(o.count("pre") > 0);
+		assert(o.count("transaction") > 0);
+
+		ImportTest importer(o, false);
+
+		eth::State theState = importer.m_statePre;
+		bytes tx = importer.m_transaction.rlp();
+		bytes output;
+
+		try
+		{
+			theState.execute(lastHashes(importer.m_environment.currentBlock.number), tx, &output);
+		}
+		catch (Exception const& _e)
+		{
+			cnote << "state execution did throw an exception: " << diagnostic_information(_e);
+			theState.commit();
+		}
+		catch (std::exception const& _e)
+		{
+			cnote << "state execution did throw an exception: " << _e.what();
+		}
+
+		assert(o.count("post") > 0);
+		assert(o.count("out") > 0);
+
+		//checkOutput(output, o);
+		int j = 0;
+		if (o["out"].type() == array_type)
+			for (auto const& d: o["out"].get_array())
+			{
+				if (asserts(output[j] == toInt(d)))
+				{
+					cout << "Output byte [" << j << "] different!";
+					return 1;
+				}
+				++j;
+			}
+		else if (o["out"].get_str().find("0x") == 0)
+		{
+			if (asserts(output == fromHex(o["out"].get_str().substr(2))))
+				return 1;
+		}
+		else
+		{
+			if (asserts(output == fromHex(o["out"].get_str())))
+				return 1;
+		}
+
+		//checkLog(theState.pending().size() ? theState.log(0) : LogEntries(), importer.m_environment.sub.logs);
+		eth::LogEntries logs = theState.pending().size() ? theState.log(0) : eth::LogEntries();
+
+		if (assertsEqual(logs.size(), importer.m_environment.sub.logs.size()))
+			return 1;
+
+		for (size_t i = 0; i < logs.size(); ++i)
+		{
+			if (assertsEqual(logs[i].address, importer.m_environment.sub.logs[i].address))
+				return 1;
+			if (assertsEqual(logs[i].topics, importer.m_environment.sub.logs[i].topics))
+				return 1;
+			if (asserts(logs[i].data == importer.m_environment.sub.logs[i].data))
+				return 1;
+		}
+
+		// check addresses
+#if ETH_FATDB
+		auto expectedAddrs = importer.m_statePost.addresses();
+		auto resultAddrs = theState.addresses();
+		for (auto& expectedPair : expectedAddrs)
+		{
+			auto& expectedAddr = expectedPair.first;
+			auto resultAddrIt = resultAddrs.find(expectedAddr);
+			if (resultAddrIt == resultAddrs.end())
+			{
+				cout << "Missing expected address " << expectedAddr;
+				return 1;
+			}
+			else
+			{
+				if (importer.m_statePost.balance(expectedAddr) !=  theState.balance(expectedAddr))
+				{
+					cout << expectedAddr << ": incorrect balance " << theState.balance(expectedAddr) << ", expected " << importer.m_statePost.balance(expectedAddr);
+					return 1;
+				}
+				if (importer.m_statePost.transactionsFrom(expectedAddr) !=  theState.transactionsFrom(expectedAddr))
+				{
+					cout << expectedAddr << ": incorrect txCount " << theState.transactionsFrom(expectedAddr) << ", expected " << importer.m_statePost.transactionsFrom(expectedAddr);
+					return 1;
+				}
+				if (importer.m_statePost.code(expectedAddr) != theState.code(expectedAddr))
+				{
+					cout << expectedAddr << ": incorrect code";
+					return 1;
+				}
+
+				//checkStorage(importer.m_statePost.storage(expectedAddr), theState.storage(expectedAddr), expectedAddr);
+				map<u256, u256> _resultStore = theState.storage(expectedAddr);
+
+				for (auto&& expectedStorePair : importer.m_statePost.storage(expectedAddr))
+				{
+					auto& expectedStoreKey = expectedStorePair.first;
+					auto resultStoreIt = _resultStore.find(expectedStoreKey);
+					if (resultStoreIt == _resultStore.end())
+					{
+						cout << expectedAddr << ": missing store key " << expectedStoreKey << endl;
+						return 1;
+					}
+					else
+					{
+						auto& expectedStoreValue = expectedStorePair.second;
+						auto& resultStoreValue = resultStoreIt->second;
+						if (asserts(expectedStoreValue == resultStoreValue))
+						{
+							cout << expectedAddr << ": store[" << expectedStoreKey << "] = " << resultStoreValue << ", expected " << expectedStoreValue << endl;
+							return 1;
+						}
+					}
+				}
+				if (assertsEqual(_resultStore.size(), importer.m_statePost.storage(expectedAddr).size()))
+					return 1;
+				for (auto&& resultStorePair: _resultStore)
+				{
+					if (!importer.m_statePost.storage(expectedAddr).count(resultStorePair.first))
+					{
+						cout << expectedAddr << ": unexpected store key " << resultStorePair.first << endl;
+						return 1;
+					}
+				}
+			}
+		}
+		//checkAddresses<map<Address, u256> >(expectedAddrs, resultAddrs);
+		for (auto& resultPair : resultAddrs)
+		{
+			auto& resultAddr = resultPair.first;
+			auto expectedAddrIt = expectedAddrs.find(resultAddr);
+			if (expectedAddrIt == expectedAddrs.end())
+				return 1;
+		}
+		if (expectedAddrs != resultAddrs)
+			return 1;
+#endif
+		if (theState.rootHash() != h256(o["postStateRoot"].get_str()))
+		{
+			cout << "wrong post state root" << endl;
+			return 1;
+		}
+	}
+	return 0;
+}
diff --git a/test/checkRandomTest.cpp b/test/checkRandomVMTest.cpp
similarity index 99%
rename from test/checkRandomTest.cpp
rename to test/checkRandomVMTest.cpp
index e3442d438..c96357714 100644
--- a/test/checkRandomTest.cpp
+++ b/test/checkRandomVMTest.cpp
@@ -32,7 +32,7 @@ using namespace json_spirit;
 using namespace dev::test;
 using namespace dev;
 
-bool doVMTest(mValue& v);
+bool doVMTest(mValue& _v);
 
 int main(int argc, char *argv[])
 {
@@ -66,11 +66,11 @@ int main(int argc, char *argv[])
 	return ret;
 }
 
-bool doVMTest(mValue& v)
+bool doVMTest(mValue& _v)
 {
 	eth::VMFactory::setKind(eth::VMKind::JIT);
 
-	for (auto& i: v.get_obj())
+	for (auto& i: _v.get_obj())
 	{
 		cnote << i.first;
 		mObject& o = i.second.get_obj();
diff --git a/test/createRandomStateTest.cpp b/test/createRandomStateTest.cpp
new file mode 100644
index 000000000..13b622bb1
--- /dev/null
+++ b/test/createRandomStateTest.cpp
@@ -0,0 +1,183 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file createRandomStateTest.cpp
+ * @author Christoph Jentzsch <jentzsch.simulationsoftware@gmail.com>
+ * @date 2015
+ * Creating a random state test.
+ */
+
+#include <string>
+#include <iostream>
+#include <chrono>
+
+#include <boost/random.hpp>
+#include <boost/filesystem/path.hpp>
+
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#include <json_spirit/json_spirit.h>
+#include <json_spirit/json_spirit_reader_template.h>
+#include <json_spirit/json_spirit_writer_template.h>
+#include <libdevcore/CommonIO.h>
+#include <libdevcore/CommonData.h>
+#include <libevmcore/Instruction.h>
+#include <libevm/VMFactory.h>
+#include "TestHelper.h"
+#include "vm.h"
+
+using namespace std;
+using namespace json_spirit;
+using namespace dev;
+
+void doStateTests(json_spirit::mValue& _v);
+
+int main(int argc, char *argv[])
+{
+	g_logVerbosity = 0;
+
+	// create random code
+
+	boost::random::mt19937 gen;
+
+	auto now = chrono::steady_clock::now().time_since_epoch();
+	auto timeSinceEpoch = chrono::duration_cast<chrono::nanoseconds>(now).count();
+	gen.seed(static_cast<unsigned int>(timeSinceEpoch));
+	boost::random::uniform_int_distribution<> lengthOfCodeDist(2, 16);
+	boost::random::uniform_int_distribution<> opcodeDist(0, 255);
+	boost::random::uniform_int_distribution<> BlockInfoOpcodeDist(0x40, 0x45);
+	boost::random::variate_generator<boost::mt19937&, boost::random::uniform_int_distribution<> > randGen(gen, opcodeDist);
+	boost::random::variate_generator<boost::mt19937&, boost::random::uniform_int_distribution<> > randGenBlockInfoOpcode(gen, BlockInfoOpcodeDist);
+
+	int lengthOfCode  = lengthOfCodeDist(gen);
+	string randomCode;
+
+	for (int i = 0; i < lengthOfCode; ++i)
+	{
+		if (i < 8 && (randGen() < 192))
+		{
+			randomCode += toHex(toCompactBigEndian((uint8_t)randGenBlockInfoOpcode()));
+			continue;
+		}
+
+		uint8_t opcode = randGen();
+		// disregard all invalid commands, except of one (0x0c)
+		if ((dev::eth::isValidInstruction(dev::eth::Instruction(opcode)) || (randGen() > 250)))
+			randomCode += toHex(toCompactBigEndian(opcode));
+		else
+			i--;
+	}
+
+	string const s = R"(
+	{
+		"randomStatetest" : {
+			"env" : {
+				"currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+				"currentDifficulty" : "5623894562375",
+				"currentGasLimit" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+				"currentNumber" : "0",
+				"currentTimestamp" : "1",
+				"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+			},
+			"pre" : {
+				"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+					"balance" : "1000000000000000000",
+					"code" : "0x6001600101600055",
+					"nonce" : "0",
+					"storage" : {
+					}
+				},
+				"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+					"balance" : "46",
+					"code" : "0x6000355415600957005b60203560003555",
+					"nonce" : "0",
+					"storage" : {
+					}
+				},
+				"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+					"balance" : "1000000000000000000",
+					"code" : "0x",
+					"nonce" : "0",
+					"storage" : {
+					}
+				}
+			},
+			"transaction" : {
+				"data" : "0x42",
+				"gasLimit" : "400000",
+				"gasPrice" : "1",
+				"nonce" : "0",
+				"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+				"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+				"value" : "100000"
+			}
+		}
+	}
+)";
+	mValue v;
+	read_string(s, v);
+
+	// insert new random code
+	v.get_obj().find("randomStatetest")->second.get_obj().find("pre")->second.get_obj().begin()->second.get_obj()["code"] = "0x" + randomCode + (randGen() > 128 ? "55" : "");
+
+	// fill test
+	doStateTests(v);
+
+	// stream to output for further handling by the bash script
+	cout << json_spirit::write_string(v, true);
+
+	return 0;
+}
+
+void doStateTests(json_spirit::mValue& _v)
+{
+	eth::VMFactory::setKind(eth::VMKind::Interpreter);
+
+	for (auto& i: _v.get_obj())
+	{
+		//cerr << i.first << endl;
+		mObject& o = i.second.get_obj();
+
+		assert(o.count("env") > 0);
+		assert(o.count("pre") > 0);
+		assert(o.count("transaction") > 0);
+
+		test::ImportTest importer(o, true);
+
+		eth::State theState = importer.m_statePre;
+		bytes tx = importer.m_transaction.rlp();
+		bytes output;
+
+		try
+		{
+			theState.execute(test::lastHashes(importer.m_environment.currentBlock.number), tx, &output);
+		}
+		catch (Exception const& _e)
+		{
+			cnote << "state execution did throw an exception: " << diagnostic_information(_e);
+			theState.commit();
+		}
+		catch (std::exception const& _e)
+		{
+			cnote << "state execution did throw an exception: " << _e.what();
+		}
+#if ETH_FATDB
+		importer.exportTest(output, theState);
+#else
+		cout << "You can not fill tests when FATDB is switched off";
+#endif
+	}
+}
+
diff --git a/test/createRandomTest.cpp b/test/createRandomVMTest.cpp
similarity index 98%
rename from test/createRandomTest.cpp
rename to test/createRandomVMTest.cpp
index 55e023759..de81099fe 100644
--- a/test/createRandomTest.cpp
+++ b/test/createRandomVMTest.cpp
@@ -41,7 +41,7 @@ using namespace std;
 using namespace json_spirit;
 using namespace dev;
 
-void doMyTests(json_spirit::mValue& v);
+void doMyTests(json_spirit::mValue& _v);
 
 int main(int argc, char *argv[])
 {
@@ -127,11 +127,11 @@ int main(int argc, char *argv[])
 	return 0;
 }
 
-void doMyTests(json_spirit::mValue& v)
+void doMyTests(json_spirit::mValue& _v)
 {
 	eth::VMFactory::setKind(eth::VMKind::Interpreter);
 
-	for (auto& i: v.get_obj())
+	for (auto& i: _v.get_obj())
 	{
 		cnote << i.first;
 		mObject& o = i.second.get_obj();
diff --git a/test/peer.cpp b/test/peer.cpp
index 0fe3fd1ed..14712d4f1 100644
--- a/test/peer.cpp
+++ b/test/peer.cpp
@@ -63,6 +63,7 @@ BOOST_AUTO_TEST_CASE(save_nodes)
 	for (auto i:{0,1,2,3,4,5})
 	{
 		Host* h = new Host("Test", NetworkPreferences(30300 + i, "127.0.0.1", true, true));
+		h->setIdealPeerCount(10);
 		// starting host is required so listenport is available
 		h->start();
 		while (!h->isStarted())
diff --git a/test/stBlockHashTestFiller.json b/test/stBlockHashTestFiller.json
index 5ecc5b1c7..32745e89b 100644
--- a/test/stBlockHashTestFiller.json
+++ b/test/stBlockHashTestFiller.json
@@ -3,7 +3,7 @@
          "env" : {
              "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
              "currentNumber" : "5",
-             "currentGasLimit" : "1000000",
+             "currentGasLimit" : "100000000000",
              "currentDifficulty" : "256",
              "currentTimestamp" : 1,
              "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
@@ -16,7 +16,7 @@
                  "storage": {}
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "100000",
+                 "balance" : "1000000",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -25,7 +25,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "28500",
+             "gasLimit" : "285000",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "10",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -37,7 +37,7 @@
          "env" : {
              "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
              "currentNumber" : "257",
-             "currentGasLimit" : "1000000",
+             "currentGasLimit" : "100000000",
              "currentDifficulty" : "256",
              "currentTimestamp" : 1,
              "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
@@ -50,7 +50,7 @@
                  "storage": {}
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "100000",
+                 "balance" : "1000000",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -59,7 +59,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "28500",
+             "gasLimit" : "285000",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "10",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -71,7 +71,7 @@
          "env" : {
              "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
              "currentNumber" : "257",
-             "currentGasLimit" : "1000000",
+             "currentGasLimit" : "100000000",
              "currentDifficulty" : "256",
              "currentTimestamp" : 1,
              "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
@@ -84,7 +84,7 @@
                  "storage": {}
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "100000",
+                 "balance" : "1000000",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -93,7 +93,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "28500",
+             "gasLimit" : "285000",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "10",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
diff --git a/test/stCallCreateCallCodeTestFiller.json b/test/stCallCreateCallCodeTestFiller.json
new file mode 100644
index 000000000..b0245ee72
--- /dev/null
+++ b/test/stCallCreateCallCodeTestFiller.json
@@ -0,0 +1,534 @@
+{
+    "callcodeWithHighValue": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "30000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{  [[ 0 ]] (CALLCODE 50000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 1000000000000000001 0 64 0 2 ) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+
+        },
+        "transaction" : {
+            "nonce" : "0",
+            "gasPrice" : "1",
+            "gasLimit" : "3000000",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "data" : ""
+        }
+    },
+
+    "callWithHighValue": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "30000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{  [[ 0 ]] (CALL 50000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 1000000000000000001 0 64 0 2 ) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+
+        },
+        "transaction" : {
+            "nonce" : "0",
+            "gasPrice" : "1",
+            "gasLimit" : "3000000",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "data" : ""
+        }
+    },
+
+    "callWithHighValueAndOOGatTxLevel": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "30000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "100000",
+                "nonce" : "0",
+                "code" : "{  [[ 0 ]] (CALL 3000001 0x945304eb96065b2a98b57a48a06ae28d285a71b5 100001 0 0 0 0 ) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+
+        },
+        "transaction" : {
+            "nonce" : "0",
+            "gasPrice" : "1",
+            "gasLimit" : "3000000",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "data" : ""
+        }
+    },
+
+    "Callcode1024BalanceTooLow" : {
+        "env" : {
+            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "0xffffffffffffffffffffffffffffffff",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+
+            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "7000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+
+            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1024",
+                "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALLCODE 0xfffffffffff 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b @@0 0 0 0 0) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "0xffffffffffffffffffffffffffffff",
+            "gasPrice" : "1",
+            "nonce" : "",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10"
+        }
+    },
+
+    "Callcode1024OOG" : {
+        "env" : {
+            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "0xffffffffffffffffffffffffffffffff",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+
+            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "7000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+
+            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1024",
+                "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALLCODE (MUL (SUB (GAS) 10000) (SUB 1 (DIV @@0 1025))) 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "0xffffffffffffffffffffffffffffff",
+            "gasPrice" : "1",
+            "nonce" : "",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10"
+        }
+    },
+
+    "CallcodeLoseGasOOG" : {
+        "env" : {
+            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "0xffffffffffffffffffffffffffffffff",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+
+            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "7000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+
+            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1024",
+                "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALLCODE (ADD 1(MUL @@0 100000)) 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+
+
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "0xffffffffffffffffffffffffffffff",
+            "gasPrice" : "1",
+            "nonce" : "",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10"
+        }
+    },
+
+    "Call1024BalanceTooLow" : {
+        "env" : {
+            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "0xffffffffffffffffffffffffffffffff",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+
+            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "7000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+
+            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1024",
+                "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALL 0xfffffffffff 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b @@0 0 0 0 0) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "0xffffffffffffffffffffffffffffff",
+            "gasPrice" : "1",
+            "nonce" : "",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10"
+        }
+    },
+
+    "Call1024OOG" : {
+        "env" : {
+            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "0xffffffffffffffffffffffffffffffff",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+
+            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "7000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+
+            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1024",
+                "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALL (MUL (SUB (GAS) 10000) (SUB 1 (DIV @@0 1025))) 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "0xffffffffffffffffffffffffffffff",
+            "gasPrice" : "1",
+            "nonce" : "",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10"
+        }
+    },
+
+    "CallLoseGasOOG" : {
+        "env" : {
+            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "0xffffffffffffffffffffffffffffffff",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+
+            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "7000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+
+            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1024",
+                "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALL (ADD 1(MUL @@0 100000)) 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+
+
+        "transaction" :
+        {
+            "data" : "",
+            "gasLimit" : "0xffffffffffffffffffffffffffffff",
+            "gasPrice" : "1",
+            "nonce" : "",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10"
+        }
+    },
+
+
+    "callcodeWithHighValueAndGasOOG": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "30000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 0xffffffffffffffffffffffff 0x945304eb96065b2a98b57a48a06ae28d285a71b5 100000000000000000000 0 64 0 2 ) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+
+        },
+        "transaction" : {
+            "nonce" : "0",
+            "gasPrice" : "1",
+            "gasLimit" : "3000000",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "100000",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "data" : ""
+        }
+    },
+
+    "callWithHighValueAndGasOOG": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "30000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 0xffffffffffffffffffffffff 0x945304eb96065b2a98b57a48a06ae28d285a71b5 100000000000000000000 0 64 0 2 ) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+
+        },
+        "transaction" : {
+            "nonce" : "0",
+            "gasPrice" : "1",
+            "gasLimit" : "3000000",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "100000",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "data" : ""
+        }
+    },
+
+    "createNameRegistratorendowmentTooHigh": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 1000000000000000001 3 29) }",
+                "storage": {}
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "transaction" : {
+            "nonce" : "0",
+            "gasPrice" : "1",
+            "gasLimit" : "300000",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "data" : ""
+        }
+    }
+}
diff --git a/test/stInitCodeTestFiller.json b/test/stInitCodeTestFiller.json
index cb1b4d14a..2c155468f 100644
--- a/test/stInitCodeTestFiller.json
+++ b/test/stInitCodeTestFiller.json
@@ -371,6 +371,46 @@
         }
     },
 
+     "CallContractToCreateContractOOGBonusGas" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "100000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre" :
+        {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87": {
+                "balance": "112",
+                "nonce": "0",
+                "//": "(CREATE 0 64 32)",
+                "//": "{[[0]] 12 (MSTORE 32 0x602060406000f0)(RETURN 57 7)}",
+                "code": "{(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 1 11 21)(CALL 0 (SLOAD 0) 12 0 0 0 0)}",
+                "storage": {}
+            },
+
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" :
+        {
+            "data" : "0x00",
+            "gasLimit" : "20000000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "0"
+        }
+    },
+
     "CallContractToCreateContractOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -385,6 +425,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87": {
                 "balance": "0",
                 "nonce": "0",
+		"//": "Create should fail. So CALL goes to 0x0...0",
                 "//": "(CREATE 0 64 32)",
                 "//": "{[[0]] 12 (MSTORE 32 0x602060406000f0)(RETURN 57 7)}",
                 "code": "{(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 1 11 21)(CALL 0 (SLOAD 0) 0 0 0 0 0)}",
diff --git a/test/stMemoryStressTestFiller.json b/test/stMemoryStressTestFiller.json
index 420f7c3db..d697db44e 100644
--- a/test/stMemoryStressTestFiller.json
+++ b/test/stMemoryStressTestFiller.json
@@ -33,6 +33,108 @@
         }
     },
 
+    "mload32bitBound_return": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "175923205248920000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ (RETURN 0 4294967297) } ",
+                "storage": {}
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1759232052489200000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "transaction" : {
+            "nonce" : "0",
+            "gasPrice" : "1",
+            "gasLimit" : "175923205248920000",
+            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "data" : ""
+        }
+    },
+
+    "mload32bitBound_return2": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "175923205248920000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{[ 0 ] 1 (RETURN 0 4294967296) } ",
+                "storage": {}
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1759232052489200000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "transaction" : {
+            "nonce" : "0",
+            "gasPrice" : "1",
+            "gasLimit" : "175923205248920000",
+            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "data" : ""
+        }
+    },
+
+    "mload32bitBound_Msize": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "175923205248920000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [4294967295] 1 [[ 0 ]] (MSIZE)} ",
+                "storage": {}
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1759232052489200000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "transaction" : {
+            "nonce" : "0",
+            "gasPrice" : "1",
+            "gasLimit" : "175923205248920000",
+            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "data" : ""
+        }
+    },
+
     "mload32bitBound2": {
         "env" : {
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
diff --git a/test/stMemoryTestFiller.json b/test/stMemoryTestFiller.json
index f34307443..676a88feb 100644
--- a/test/stMemoryTestFiller.json
+++ b/test/stMemoryTestFiller.json
@@ -25,7 +25,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "22000",
+            "gasLimit" : "220000",
             "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : "10",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
diff --git a/test/stPreCompiledContractsFiller.json b/test/stPreCompiledContractsFiller.json
index d571dfccc..9e5fa862a 100644
--- a/test/stPreCompiledContractsFiller.json
+++ b/test/stPreCompiledContractsFiller.json
@@ -12,7 +12,7 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 1000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
+                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 100000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -25,7 +25,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "365224",
+            "gasLimit" : "3652240",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -46,7 +46,7 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 1000 1 0 0 128 64 32) [[ 0 ]] (MOD (MLOAD 64) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
+                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 100000 1 0 0 128 64 32) [[ 0 ]] (MOD (MLOAD 64) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -81,7 +81,41 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 1000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) }",
+                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 100000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) }",
+                 "storage": {}
+             },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "transaction" : {
+            "nonce" : "0",
+            "gasPrice" : "1",
+            "gasLimit" : "365224",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "100000",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "data" : ""
+        }
+     },
+
+    "CallEcrecover0_gas3000": {
+         "env" : {
+             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+             "currentNumber" : "0",
+             "currentGasLimit" : "10000000",
+             "currentDifficulty" : "256",
+             "currentTimestamp" : 1,
+             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+         },
+         "pre" : {
+             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                 "balance" : "20000000",
+                 "nonce" : "0",
+                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 3000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -102,7 +136,7 @@
         }
      },
 
-    "CallEcrecover0_gas500": {
+    "CallEcrecover0_BonusGas": {
          "env" : {
              "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
              "currentNumber" : "0",
@@ -115,7 +149,7 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 500 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
+                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 0 1 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -136,7 +170,7 @@
         }
      },
 
-    "CallEcrecover0_Gas499": {
+    "CallEcrecover0_Gas2999": {
          "env" : {
              "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
              "currentNumber" : "0",
@@ -149,7 +183,7 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 499 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
+                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 2999 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -183,7 +217,7 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code": "{ [[ 2 ]] (CALL 1000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) }",
+                 "code": "{ [[ 2 ]] (CALL 100000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) }",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -217,7 +251,7 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 1) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 1000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
+                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 1) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 100000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -251,7 +285,7 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 33 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 65 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 1000 1 0 0 97 97 32) [[ 0 ]] (MOD (MLOAD 97) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
+                 "code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 33 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 65 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 100000 1 0 0 97 97 32) [[ 0 ]] (MOD (MLOAD 97) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -285,7 +319,7 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code": "{ (MSTORE 0 0x2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9) (MSTORE 32 27) (MSTORE 64 0x6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a) (MSTORE 96 0x37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4) [[ 2 ]] (CALL 1000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
+                 "code": "{ (MSTORE 0 0x2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9) (MSTORE 32 27) (MSTORE 64 0x6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a) (MSTORE 96 0x37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4) [[ 2 ]] (CALL 100000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -625,7 +659,7 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code" : "{ [[ 2 ]] (CALL 500 3 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}",
+                 "code" : "{ [[ 2 ]] (CALL 600 3 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -659,7 +693,7 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code" : "{ (MSTORE 5 0xf34578907f) [[ 2 ]] (CALL 500 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}",
+                 "code" : "{ (MSTORE 5 0xf34578907f) [[ 2 ]] (CALL 600 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -693,7 +727,7 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code" : "{ (MSTORE 0 0xf34578907f) [[ 2 ]] (CALL 500 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}",
+                 "code" : "{ (MSTORE 0 0xf34578907f) [[ 2 ]] (CALL 600 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -727,7 +761,7 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 100 3 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}",
+                 "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 120 3 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -761,7 +795,7 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 99 3 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}",
+                 "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 119 3 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -795,7 +829,7 @@
              "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                  "balance" : "20000000",
                  "nonce" : "0",
-                 "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 500 3 0 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}",
+                 "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 600 3 0 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}",
                  "storage": {}
              },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/test/stRefundTestFiller.json b/test/stRefundTestFiller.json
index b0d0e1747..5fb040f50 100644
--- a/test/stRefundTestFiller.json
+++ b/test/stRefundTestFiller.json
@@ -3,7 +3,7 @@
         "env" : {
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
             "currentNumber" : "0",
-            "currentGasLimit" : "1000000",
+            "currentGasLimit" : "228500",
             "currentDifficulty" : "256",
             "currentTimestamp" : 1,
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
@@ -18,7 +18,7 @@
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "100000",
+                "balance" : "2285000",
                 "nonce" : "0",
                 "code" : "",
                 "storage": {}
@@ -27,7 +27,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "22850",
+            "gasLimit" : "228500",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "10",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -54,7 +54,7 @@
                  }
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "100000",
+                 "balance" : "1000000",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -63,7 +63,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "22850",
+             "gasLimit" : "228500",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "10",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -90,7 +90,7 @@
                  }
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "50000",
+                 "balance" : "500000",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -99,7 +99,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "21000",
+             "gasLimit" : "26005",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "0",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -135,7 +135,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "21002",
+             "gasLimit" : "26006",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "0",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -223,7 +223,7 @@
          }
      },
 
-    "refund500" : {
+    "refund50percentCap" : {
          "env" : {
              "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
              "currentNumber" : "0",
@@ -305,7 +305,56 @@
          }
      },
 
-    "refund_CallToSuicide" : {
+    "refundSuicide50procentCap" : {
+         "env" : {
+             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+             "currentNumber" : "0",
+             "currentGasLimit" : "10000000",
+             "currentDifficulty" : "256",
+             "currentTimestamp" : 1,
+             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+         },
+         "pre" : {
+             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                 "balance" : "1000000000000000000",
+                 "nonce" : "0",
+                 "code" : "{ [[ 22 ]] (GAS) [[ 10 ]] 1 [[ 11 ]] (CALL 500 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 ) [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 [[ 6 ]] 0 [[ 7 ]] 0 [[ 8 ]] 0 [[ 23 ]] (GAS) }",
+                 "storage" : {
+                     "0x01" : "0x01",
+                     "0x02" : "0x01",
+                     "0x03" : "0x01",
+                     "0x04" : "0x01",
+                     "0x05" : "0x01",
+                     "0x06" : "0x01",
+                     "0x07" : "0x01",
+                     "0x08" : "0x01"
+                 }
+             },
+             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                 "balance" : "10000000",
+                 "nonce" : "0",
+                 "code" : "",
+                 "storage": {}
+             },
+            "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                "storage" : {}
+            }
+         },
+         "transaction" : {
+             "nonce" : "0",
+             "gasPrice" : "1",
+             "gasLimit" : "10000000",
+             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+             "value" : "0",
+             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+             "data" : ""
+         }
+     },
+
+    "refund_CallToSuicideStorage" : {
          "env" : {
              "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
              "currentNumber" : "0",
@@ -349,6 +398,120 @@
          }
      },
 
+    "refund_CallToSuicideNoStorage" : {
+         "env" : {
+             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+             "currentNumber" : "0",
+             "currentGasLimit" : "10000000",
+             "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" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "storage" : {}
+             },
+             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                 "balance" : "100000000",
+                 "nonce" : "0",
+                 "code" : "",
+                 "storage": {}
+             }
+         },
+         "transaction" : {
+             "nonce" : "0",
+             "gasPrice" : "1",
+             "gasLimit" : "10000000",
+             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+             "value" : "10",
+             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+             "data" : ""
+         }
+     },
+
+    "refund_TxToSuicide" : {
+         "env" : {
+             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+             "currentNumber" : "0",
+             "currentGasLimit" : "10000000",
+             "currentDifficulty" : "256",
+             "currentTimestamp" : 1,
+             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+         },
+         "pre" : {
+             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                 "balance" : "1000000000000000000",
+                 "nonce" : "0",
+                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "storage" : {
+                     "0x01" : "0x01"
+                 }
+             },
+             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                 "balance" : "100000000",
+                 "nonce" : "0",
+                 "code" : "",
+                 "storage": {}
+             }
+         },
+         "transaction" : {
+             "nonce" : "0",
+             "gasPrice" : "1",
+             "gasLimit" : "21003",
+             "to" : "aaae7baea6a6c7c4c2dfeb977efac326af552aaa",
+             "value" : "10",
+             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+             "data" : ""
+         }
+     },
+
+    "refund_TxToSuicideOOG" : {
+         "env" : {
+             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+             "currentNumber" : "0",
+             "currentGasLimit" : "10000000",
+             "currentDifficulty" : "256",
+             "currentTimestamp" : 1,
+             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+         },
+         "pre" : {
+             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                 "balance" : "1000000000000000000",
+                 "nonce" : "0",
+                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "storage" : {
+                     "0x01" : "0x01"
+                 }
+             },
+             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                 "balance" : "100000000",
+                 "nonce" : "0",
+                 "code" : "",
+                 "storage": {}
+             }
+         },
+         "transaction" : {
+             "nonce" : "0",
+             "gasPrice" : "1",
+             "gasLimit" : "21002",
+             "to" : "aaae7baea6a6c7c4c2dfeb977efac326af552aaa",
+             "value" : "10",
+             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+             "data" : ""
+         }
+     },
+
     "refund_CallToSuicideTwice" : {
          "env" : {
              "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
@@ -406,7 +569,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CALL 500 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
+                "code" : "{ [[ 0 ]] (CALL 5500 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
                 "storage" : {
                     "0x01" : "0x01"
                 }
@@ -420,7 +583,7 @@
                  }
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "2000",
+                 "balance" : "2000000",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -429,7 +592,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "1500",
+             "gasLimit" : "200000",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "10",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -437,7 +600,7 @@
          }
      },
 
-    "refund_CallA2" : {
+    "refund_CallA_notEnoughGasInCall" : {
          "env" : {
              "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
              "currentNumber" : "0",
@@ -450,7 +613,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CALL 50 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
+                "code" : "{ [[ 0 ]] (CALL 5005 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
                 "storage" : {
                     "0x01" : "0x01"
                 }
@@ -464,7 +627,7 @@
                  }
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "1000",
+                 "balance" : "100000",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -473,7 +636,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "850",
+             "gasLimit" : "85000",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "10",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -494,7 +657,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CALL 1 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
+                "code" : "{ [[ 0 ]] (CALL 6000 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
                 "storage" : {
                     "0x01" : "0x01"
                 }
@@ -508,7 +671,7 @@
                  }
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                 "balance" : "1000",
+                 "balance" : "300000",
                  "nonce" : "0",
                  "code" : "",
                  "storage": {}
@@ -517,7 +680,7 @@
          "transaction" : {
              "nonce" : "0",
              "gasPrice" : "1",
-             "gasLimit" : "850",
+             "gasLimit" : "31069",
              "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
              "value" : "10",
              "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
diff --git a/test/stSolidityTestFiller.json b/test/stSolidityTestFiller.json
index 948dc5f7a..f2a2a0aa0 100644
--- a/test/stSolidityTestFiller.json
+++ b/test/stSolidityTestFiller.json
@@ -3,7 +3,7 @@
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
-            "currentGasLimit" : "1000000000000000000000",
+            "currentGasLimit" : "1000000000000000000000000",
             "currentNumber" : "120",
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
@@ -11,7 +11,7 @@
         "pre" :
         {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000000000000",
+                "balance" : "1000000000000000000",
                 "code" : "",
                 "nonce" : "0",
                 "storage" : {
@@ -19,7 +19,7 @@
             },
 
 	     "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "100000",		
+                "balance" : "1000000",		
 		"//" : "															",
 		"//" : "contract TestContract													",
 		"//" : "{															",
@@ -203,7 +203,7 @@
 		"//" : "        a = new TestContract(); 											",
 		"//" : "    } 															",
 		"//" : "}															",
-                "code" : "0x60003560e060020a900480630c4c9a8014610084578063296df0df146100965780632a9afb83146100a8578063380e4396146100ba5780634893d88a146100cc5780637ee17e12146100da578063981a3165146100e8578063a60eedda146100fa578063e0a9fd281461010c578063e97384dc1461011e578063ed973fe91461013057005b61008c6102c0565b8060005260206000f35b61009e61067b565b8060005260206000f35b6100b06101ba565b8060005260206000f35b6100c261049b565b8060005260206000f35b6100d461087d565b60006000f35b6100e26101a4565b60006000f35b6100f06102ab565b8060005260206000f35b610102610695565b8060005260206000f35b610114610732565b8060005260206000f35b61012661055a565b8060005260206000f35b610138610142565b8060005260206000f35b600060006060610889600039606060006000f0905080600160a060020a031663b9c3d0a5602060008260e060020a026000526004600060008660155a03f150505060005160e1146101925761019b565b600191506101a0565b600091505b5090565b60006060610889600039606060006000f0905090565b60006001905060005460ff14156101d0576101d9565b600090506102a8565b60025460005414156101ea576101f3565b600090506102a8565b600154600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561021f57610228565b600090506102a8565b6003547f676c6f62616c2064617461203332206c656e67746820737472696e6700000000141561025757610260565b600090506102a8565b600460006000815260200190815260200160002054600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561029e576102a7565b600090506102a8565b5b90565b6000600090506102b961087d565b6001905090565b6000600090506102ce6101a4565b506102d761049b565b156102e157610307565b7ff000000000000000000000000000000000000000000000000000000000000000810190505b61030f610142565b156103195761033f565b7f0f00000000000000000000000000000000000000000000000000000000000000810190505b610347610695565b1561035157610376565b7ef0000000000000000000000000000000000000000000000000000000000000810190505b61037e61055a565b15610388576103ad565b7e0f000000000000000000000000000000000000000000000000000000000000810190505b60ff60008190555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b60018190555060ff6002819055507f676c6f62616c2064617461203332206c656e67746820737472696e670000000060038190555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6004600060008152602001908152602001600020819055506104346101ba565b1561043e57610462565b7df00000000000000000000000000000000000000000000000000000000000810190505b61046a610732565b1561047457610498565b7d0f0000000000000000000000000000000000000000000000000000000000810190505b90565b6000600060006000915060009250816000146104b65761053a565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7821315610530575b600a8212156104f55781806001019250506104df565b81600a146105025761052b565b600a90505b60008160ff16111561052a57818060019003925050808060019003915050610507565b5b610539565b60009250610555565b5b8160001461054757610550565b60019250610555565b600092505b505090565b60006001905041600160a060020a0316732adc25665018aa1fe0e6bc666dac8fc2697ff9ba141561058a57610593565b60009050610678565b446302b8feb014156105a4576105ad565b60009050610678565b45683635c9adc5dea0000014156105c3576105cc565b60009050610678565b43607814156105da576105e3565b60009050610678565b33600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561060d57610616565b60009050610678565b34606414156106245761062d565b60009050610678565b3a6001141561063b57610644565b60009050610678565b32600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561066e57610677565b60009050610678565b5b90565b6000600090505b60011561068e57610682565b6001905090565b60006000600191506060610889600039606060006000f0905080600160a060020a031662f55d9d600060008260e060020a02600052600441600160a060020a03168152602001600060008660155a03f150505080600160a060020a031663b9c3d0a5602060008260e060020a026000526004600060008660155a03f150505060005160e114156107245761072d565b6000915061072e565b5b5090565b60006001905060007f74657374737472696e67000000000000000000000000000000000000000000008152600a016000207f43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d141561078f57610798565b6000905061087a565b60026020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a01600060008560155a03f150506000517f3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d11114156108015761080a565b6000905061087a565b60036020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a01600060008560155a03f15050600051600160a060020a031673cd566972b5e50104011a92b59fa8e0b1234851ae141561087057610879565b6000905061087a565b5b90565b6108856102ab565b505600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
+                "code" : "0x60003560e060020a900480630c4c9a80146100635780632a9afb8314610075578063380e4396146100875780637ee17e1214610099578063a60eedda146100a7578063e0a9fd28146100b9578063e97384dc146100cb578063ed973fe9146100dd57005b61006b610473565b8060005260206000f35b61007d61064e565b8060005260206000f35b61008f61073f565b8060005260206000f35b6100a16107fe565b60006000f35b6100af6100ef565b8060005260206000f35b6100c1610196565b8060005260206000f35b6100d3610352565b8060005260206000f35b6100e56102eb565b8060005260206000f35b60006000600191506060610815600039606060006000f0905080600160a060020a031662f55d9d600060008260e060020a02600052600441600160a060020a03168152602001600060008660325a03f161014557005b505080600160a060020a031663b9c3d0a5602060008260e060020a026000526004600060008660325a03f161017657005b505060005160e1141561018857610191565b60009150610192565b5b5090565b60006001905060007f74657374737472696e67000000000000000000000000000000000000000000008152600a016000207f43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d14156101f3576101fc565b600090506102e8565b60026020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a01600060008560325a03f161023a57005b506000517f3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d111141561026a57610273565b600090506102e8565b60036020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a01600060008560325a03f16102b157005b50600051600160a060020a031673cd566972b5e50104011a92b59fa8e0b1234851ae14156102de576102e7565b600090506102e8565b5b90565b600060006060610815600039606060006000f0905080600160a060020a031663b9c3d0a5602060008260e060020a026000526004600060008660325a03f161032f57005b505060005160e11461034057610349565b6001915061034e565b600091505b5090565b60006001905041600160a060020a0316732adc25665018aa1fe0e6bc666dac8fc2697ff9ba14156103825761038b565b60009050610470565b446302b8feb0141561039c576103a5565b60009050610470565b45683635c9adc5dea0000014156103bb576103c4565b60009050610470565b43607814156103d2576103db565b60009050610470565b33600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b14156104055761040e565b60009050610470565b346064141561041c57610425565b60009050610470565b3a600114156104335761043c565b60009050610470565b32600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b14156104665761046f565b60009050610470565b5b90565b6000600090506104816107fe565b5061048a61073f565b15610494576104ba565b7ff000000000000000000000000000000000000000000000000000000000000000810190505b6104c26102eb565b156104cc576104f2565b7f0f00000000000000000000000000000000000000000000000000000000000000810190505b6104fa6100ef565b1561050457610529565b7ef0000000000000000000000000000000000000000000000000000000000000810190505b610531610352565b1561053b57610560565b7e0f000000000000000000000000000000000000000000000000000000000000810190505b60ff60008190555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b60018190555060ff6002819055507f676c6f62616c2064617461203332206c656e67746820737472696e670000000060038190555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6004600060008152602001908152602001600020819055506105e761064e565b156105f157610615565b7df00000000000000000000000000000000000000000000000000000000000810190505b61061d610196565b156106275761064b565b7d0f0000000000000000000000000000000000000000000000000000000000810190505b90565b60006001905060005460ff14156106645761066d565b6000905061073c565b600254600054141561067e57610687565b6000905061073c565b600154600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b14156106b3576106bc565b6000905061073c565b6003547f676c6f62616c2064617461203332206c656e67746820737472696e670000000014156106eb576106f4565b6000905061073c565b600460006000815260200190815260200160002054600160a060020a031673a94f5374fce5edbc8e2a8697c15331677e6ebf0b14156107325761073b565b6000905061073c565b5b90565b60006000600060009150600092508160001461075a576107de565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe78213156107d4575b600a821215610799578180600101925050610783565b81600a146107a6576107cf565b600a90505b60008160ff1611156107ce578180600190039250508080600190039150506107ab565b5b6107dd565b600092506107f9565b5b816000146107eb576107f4565b600192506107f9565b600092505b505090565b60006060610815600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
                 "nonce" : "0",
                 "storage" : {
                 }		
@@ -216,7 +216,7 @@
 	    "data" : "0x7ee17e12",
 	    "//"   : "runSolidityTests()",
 	    "data" : "0x0c4c9a80",
-            "gasLimit" : "465224",
+            "gasLimit" : "15000000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -249,11 +249,13 @@
 		"//": "contract main				",
 		"//": "{					",
 		"//": "   uint data;				",
+		"//": "   address msgsender;			",
 		"//": "   function run() returns (uint)		",
 		"//": "   {					",
 		"//": "       data = 1;				",
+		"//": "	      msgsender = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;		",
 		"//": "       subcaller a = new subcaller();	",
-		"//": "       a.init(msg.sender);		",
+		"//": "       a.init(msgsender);		",
 		"//": "       return data;			",
 		"//": "   }					",
 		"//": "   					",
@@ -262,13 +264,13 @@
 		"//": "       data = _data;			",
 		"//": "   }					",
 		"//": "}",
-                "code" : "0x60e060020a60003504806330debb4214610020578063c04062261461003157005b61002b6004356100a4565b60006000f35b610039610043565b8060005260206000f35b60006000600160008190555060656100af600039606560006000f0905080600160a060020a03166319ab453c600060008260e060020a02600052600433600160a060020a03168152602001600060008660155a03f150505060005491505090565b80600081905550505600605980600c6000396000f30060e060020a60003504806319ab453c14601457005b601d6004356023565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660155a03f15050505056",
+                "code" : "0x60003560e060020a9004806330debb4214610021578063c04062261461003257005b61002c6004356100c7565b60006000f35b61003a610044565b8060005260206000f35b60006000600160008190555073095e7baea6a6c7c4c2dfeb977efac326af552d87600181905550606a6100d2600039606a60006000f0905080600160a060020a03166319ab453c600060008260e060020a026000526004600154600160a060020a03168152602001600060008660325a03f16100bc57005b505060005491505090565b80600081905550505600605e80600c6000396000f30060003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "100000",
+                "balance" : "1000000",
                 "nonce" : "0",
                 "code" : "",
                 "storage": {}
@@ -278,7 +280,7 @@
         {
 	    "//" : "run()",
             "data" : "0xc0406226",
-            "gasLimit" : "35000",
+            "gasLimit" : "350000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -287,7 +289,7 @@
         }
     },
 
- "CallRecursiveMethods" : {
+  "CallRecursiveMethods" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -317,13 +319,13 @@
 		"//" : "        testRecursiveMethods();		",
 		"//" : "    }					",
 		"//" : "}",
-                "code" : "0x60e060020a600035048063296df0df1460285780634893d88a146034578063981a316514604057005b602e604c565b60006000f35b603a6061565b60006000f35b60466059565b60006000f35b5b600115605757604d565b565b605f6061565b565b60676059565b56",
+                "code" : "0x60003560e060020a90048063296df0df1460295780634893d88a146035578063981a316514604157005b602f604d565b60006000f35b603b6062565b60006000f35b6047605a565b60006000f35b5b600115605857604e565b565b60606062565b565b6068605a565b56",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "100000",
+                "balance" : "500000",
                 "nonce" : "0",
                 "code" : "",
                 "storage": {}
@@ -333,7 +335,7 @@
         {
 	    "//" : "testRecursiveMethods()",
             "data" : "0x981a3165",
-            "gasLimit" : "25000",
+            "gasLimit" : "30000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -372,13 +374,13 @@
 		"//" : "        testRecursiveMethods();		",
 		"//" : "    }					",
 		"//" : "}",
-                "code" : "0x60e060020a600035048063296df0df1460285780634893d88a146034578063981a316514604057005b602e604c565b60006000f35b603a6061565b60006000f35b60466059565b60006000f35b5b600115605757604d565b565b605f6061565b565b60676059565b56",
+                "code" : "0x60003560e060020a90048063296df0df1460295780634893d88a146035578063981a316514604157005b602f604d565b60006000f35b603b6062565b60006000f35b6047605a565b60006000f35b5b600115605857604e565b565b60606062565b565b6068605a565b56",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "50000",
+                "balance" : "500000",
                 "nonce" : "0",
                 "code" : "",
                 "storage": {}
@@ -388,7 +390,86 @@
         {
 	    "//" : "testInfiniteLoop()",
             "data" : "0x296df0df",
-            "gasLimit" : "30000",
+            "gasLimit" : "300000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "1"
+        }
+    },
+
+    "RecursiveCreateContractsCreate4Contracts" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "100000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre" :
+        {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000000000000000000",
+		"//" : "contract recursiveCreate1							",
+		"//" : "{										",
+		"//" : "    uint depp;									",
+		"//" : "    function recursiveCreate1(address a, uint depth)				",
+		"//" : "    {										",
+		"//" : "        depth = depth - 1;							",
+		"//" : "	depp = depth;								",
+		"//" : "        if(depth > 0)								",
+		"//" : "            main(a).create2(depth);						",
+		"//" : "    }										",
+		"//" : "}										",
+		"//" : "										",
+		"//" : "contract recursiveCreate2							",
+		"//" : "{										",
+		"//" : "    uint depp;									",
+		"//" : "    function recursiveCreate2(address a, uint depth)				",
+		"//" : "    {										",
+		"//" : "        depth = depth - 1;							",
+		"//" : "	depp = depth;								",
+		"//" : "        if(depth > 0)								",
+		"//" : "            recursiveCreate1 rec1 = new recursiveCreate1(a, depth);		",
+    		"//" : "    }										",
+		"//" : "}										",
+		"//" : "										",
+		"//" : "contract main									",
+		"//" : "{										",
+		"//" : "    address maincontract;							",
+		"//" : "    uint depp;									",
+		"//" : "    function run(uint depth)							",
+		"//" : "    {										",
+		"//" : "        maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;		",
+		"//" : "        depp = depth;								",
+		"//" : "        recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);	",
+		"//" : "    }										",
+		"//" : "    										",
+		"//" : "    function create2(uint depth)						",
+		"//" : "    {										",
+		"//" : "        recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);	",
+		"//" : "        address(rec2).send(2);							",
+		"//" : "    }										",
+		"//" : "}",
+                "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "5000000",
+                "nonce" : "0",
+                "code" : "",
+                "storage": {}
+            }
+        },
+        "transaction" :
+        {
+	    "//" : "run(uint256)",
+            "data" : "0xa444f5e90000000000000000000000000000000000000000000000000000000000000004",
+            "gasLimit" : "300000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -409,12 +490,14 @@
         "pre" :
         {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "1000000",
+                "balance" : "1000000000000000000000000000000000",
 		"//" : "contract recursiveCreate1							",
 		"//" : "{										",
+		"//" : "    uint depp;									",
 		"//" : "    function recursiveCreate1(address a, uint depth)				",
 		"//" : "    {										",
 		"//" : "        depth = depth - 1;							",
+		"//" : "	depp = depth;								",
 		"//" : "        if(depth > 0)								",
 		"//" : "            main(a).create2(depth);						",
 		"//" : "    }										",
@@ -422,9 +505,11 @@
 		"//" : "										",
 		"//" : "contract recursiveCreate2							",
 		"//" : "{										",
+		"//" : "    uint depp;									",
 		"//" : "    function recursiveCreate2(address a, uint depth)				",
 		"//" : "    {										",
 		"//" : "        depth = depth - 1;							",
+		"//" : "	depp = depth;								",
 		"//" : "        if(depth > 0)								",
 		"//" : "            recursiveCreate1 rec1 = new recursiveCreate1(a, depth);		",
     		"//" : "    }										",
@@ -436,7 +521,7 @@
 		"//" : "    uint depp;									",
 		"//" : "    function run(uint depth)							",
 		"//" : "    {										",
-		"//" : "        maincontract = msg.sender;						",
+		"//" : "        maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;		",
 		"//" : "        depp = depth;								",
 		"//" : "        recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);	",
 		"//" : "    }										",
@@ -447,13 +532,13 @@
 		"//" : "        address(rec2).send(2);							",
 		"//" : "    }										",
 		"//" : "}",
-                "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610043565b60006000f35b61003d60043561008f565b60006000f35b600060c66100cc60003960c6600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f1505050505050565b6000336000819055508160018190555060686101926000396068600054600160a060020a0316815260200182815260200160006000f09050505056006012604060c6600439600451602451601e565b60018060c56000396000f35b6000600182039150600082116031576057565b6068605d600039606883600160a060020a0316815260200182815260200160006000f090505b5050505600601260406068600439600451602451601e565b60018060676000396000f35b60018103905060008111602f576062565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660155a03f15050505b505056000000601260406068600439600451602451601e565b60018060676000396000f35b60018103905060008111602f576062565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660155a03f15050505b5050560000",
+                "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "500000",
+                "balance" : "5000000",
                 "nonce" : "0",
                 "code" : "",
                 "storage": {}
@@ -462,8 +547,8 @@
         "transaction" :
         {
 	    "//" : "run(uint256)",
-            "data" : "0xa444f5e900000000000000000000000000000000000000000000000000000000000204",
-            "gasLimit" : "30000",
+            "data" : "0xa444f5e90000000000000000000000000000000000000000000000000000000000000204",
+            "gasLimit" : "300000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -508,7 +593,7 @@
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "50000",
+                "balance" : "500000",
                 "nonce" : "0",
                 "code" : "",
                 "storage": {}
@@ -518,7 +603,7 @@
         {
 	    "//" : "run()",
             "data" : "0xc0406226",
-            "gasLimit" : "30000",
+            "gasLimit" : "300000",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
diff --git a/test/stSystemOperationsTestFiller.json b/test/stSystemOperationsTestFiller.json
index 7460ca94e..23ff8c4c3 100644
--- a/test/stSystemOperationsTestFiller.json
+++ b/test/stSystemOperationsTestFiller.json
@@ -389,7 +389,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 64 0) }",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 64 0) }",
                 "storage": {}
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -410,7 +410,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "30000",
+            "gasLimit" : "300000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -797,7 +797,7 @@
         "env" : {
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
             "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
+            "currentGasLimit" : "30000000",
             "currentDifficulty" : "256",
             "currentTimestamp" : 1,
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
@@ -806,7 +806,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 0 2 ) }",
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 50000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 0 2 ) }",
                 "storage": {}
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -827,7 +827,7 @@
         "transaction" : {
             "nonce" : "0",
             "gasPrice" : "1",
-            "gasLimit" : "30000",
+            "gasLimit" : "3000000",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "100000",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
diff --git a/test/stTransactionTestFiller.json b/test/stTransactionTestFiller.json
index 2f60db437..26a69f187 100644
--- a/test/stTransactionTestFiller.json
+++ b/test/stTransactionTestFiller.json
@@ -1177,6 +1177,7 @@
         },
         "transaction" :
         {
+	    "data" : "cost (0 - 4  !0 - 68) 10*4 + 9*68 = 652",
             "data" : "0x00000000000000000000112233445566778f32",
             "gasLimit" : "22000",
             "gasPrice" : "1",
diff --git a/test/state.cpp b/test/state.cpp
index 5202aff22..d6790029a 100644
--- a/test/state.cpp
+++ b/test/state.cpp
@@ -41,7 +41,7 @@ namespace dev {  namespace test {
 
 void doStateTests(json_spirit::mValue& v, bool _fillin)
 {
-	processCommandLineOptions();
+	Options::get(); // process command line options
 
 	for (auto& i: v.get_obj())
 	{
@@ -130,6 +130,11 @@ BOOST_AUTO_TEST_CASE(stSystemOperationsTest)
 	dev::test::executeTests("stSystemOperationsTest", "/StateTests", dev::test::doStateTests);
 }
 
+BOOST_AUTO_TEST_CASE(stCallCreateCallCodeTest)
+{
+	dev::test::executeTests("stCallCreateCallCodeTest", "/StateTests", dev::test::doStateTests);
+}
+
 BOOST_AUTO_TEST_CASE(stPreCompiledContracts)
 {
 	dev::test::executeTests("stPreCompiledContracts", "/StateTests", dev::test::doStateTests);
@@ -172,48 +177,40 @@ BOOST_AUTO_TEST_CASE(stBlockHashTest)
 
 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";
-			   }
-	   }
+	if (test::Options::get().quadratic)
+	{
+		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";
-			   }
-	   }
+	if (test::Options::get().memory)
+	{
+		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(stSolidityTest)
+{
+	dev::test::executeTests("stSolidityTest", "/StateTests", dev::test::doStateTests);
+}
 
 BOOST_AUTO_TEST_CASE(stMemoryTest)
 {
-	   dev::test::executeTests("stMemoryTest", "/StateTests", dev::test::doStateTests);
+	dev::test::executeTests("stMemoryTest", "/StateTests", dev::test::doStateTests);
 }
 
 
@@ -251,6 +248,39 @@ BOOST_AUTO_TEST_CASE(stCreateTest)
 	}
 }
 
+BOOST_AUTO_TEST_CASE(stRandom)
+{
+	string testPath = dev::test::getTestPath();
+	testPath += "/StateTests/RandomTests";
+
+	vector<boost::filesystem::path> testFiles;
+	boost::filesystem::directory_iterator iterator(testPath);
+	for(; iterator != boost::filesystem::directory_iterator(); ++iterator)
+		if (boost::filesystem::is_regular_file(iterator->path()) && iterator->path().extension() == ".json")
+			testFiles.push_back(iterator->path());
+
+	for (auto& path: testFiles)
+	{
+		try
+		{
+			cnote << "Testing ..." << path.filename();
+			json_spirit::mValue v;
+			string s = asString(dev::contents(path.string()));
+			BOOST_REQUIRE_MESSAGE(s.length() > 0, "Content of " + path.string() + " is empty. Have you cloned the 'tests' repo branch develop and set ETHEREUM_TEST_PATH to its path?");
+			json_spirit::read_string(s, v);
+			dev::test::doStateTests(v, false);
+		}
+		catch (Exception const& _e)
+		{
+			BOOST_ERROR("Failed test with Exception: " << diagnostic_information(_e));
+		}
+		catch (std::exception const& _e)
+		{
+			BOOST_ERROR("Failed test with Exception: " << _e.what());
+		}
+	}
+}
+
 BOOST_AUTO_TEST_CASE(userDefinedFileState)
 {
 	dev::test::userDefinedTest("--singletest", dev::test::doStateTests);
diff --git a/test/transaction.cpp b/test/transaction.cpp
index 83fd8da4d..77f6ecdaf 100644
--- a/test/transaction.cpp
+++ b/test/transaction.cpp
@@ -116,21 +116,16 @@ BOOST_AUTO_TEST_CASE(ttWrongRLPTransaction)
 
 BOOST_AUTO_TEST_CASE(tt10mbDataField)
 {
-	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
+	if (test::Options::get().bigData)
 	{
-		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == "--bigdata" || arg == "--all")
-		{
-			auto start = chrono::steady_clock::now();
+		auto start = chrono::steady_clock::now();
 
-			dev::test::executeTests("tt10mbDataField", "/TransactionTests", dev::test::doTransactionTests);
+		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";
-		}
+		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)
diff --git a/test/vm.cpp b/test/vm.cpp
index a39f0005f..4433a60ee 100644
--- a/test/vm.cpp
+++ b/test/vm.cpp
@@ -312,7 +312,7 @@ namespace dev { namespace test {
 
 void doVMTests(json_spirit::mValue& v, bool _fillin)
 {
-	processCommandLineOptions();
+	Options::get(); // process command line options // TODO: We need to control the main() function
 
 	for (auto& i: v.get_obj())
 	{
@@ -344,7 +344,8 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
 		try
 		{
 			auto vm = eth::VMFactory::create(fev.gas);
-			output = vm->go(fev, fev.simpleTrace()).toBytes();
+			auto vmtrace = Options::get().vmtrace ? fev.simpleTrace() : OnOpFunc{};
+			output = vm->go(fev, vmtrace).toBytes();
 			gas = vm->gas();
 		}
 		catch (VMException const&)
@@ -364,18 +365,12 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
 		}
 
 		auto endTime = std::chrono::high_resolution_clock::now();
-		auto argc = boost::unit_test::framework::master_test_suite().argc;
-		auto argv = boost::unit_test::framework::master_test_suite().argv;
-		for (auto i = 0; i < argc; ++i)
+		if (Options::get().showTimes)
 		{
-			if (std::string(argv[i]) == "--show-times")
-			{
-				auto testDuration = endTime - startTime;
-				cnote << "Execution time: "
-				      << std::chrono::duration_cast<std::chrono::milliseconds>(testDuration).count()
-				      << " ms";
-				break;
-			}
+			auto testDuration = endTime - startTime;
+			cnote << "Execution time: "
+				  << std::chrono::duration_cast<std::chrono::milliseconds>(testDuration).count()
+				  << " ms";
 		}
 
 		// delete null entries in storage for the sake of comparison
@@ -517,58 +512,42 @@ BOOST_AUTO_TEST_CASE(vmSystemOperationsTest)
 
 BOOST_AUTO_TEST_CASE(vmPerformanceTest)
 {
-	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
+	if (test::Options::get().performance)
 	{
-		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == "--performance" || arg == "--all")
-		{
-			auto start = chrono::steady_clock::now();
+		auto start = chrono::steady_clock::now();
 
-			dev::test::executeTests("vmPerformanceTest", "/VMTests", dev::test::doVMTests);
+		dev::test::executeTests("vmPerformanceTest", "/VMTests", dev::test::doVMTests);
 
-			auto end = chrono::steady_clock::now();
-			auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
-			cnote << "test duration: " << duration.count() << " milliseconds.\n";
-		}
+		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(vmInputLimitsTest1)
 {
-	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
+	if (test::Options::get().inputLimits)
 	{
-		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == "--inputlimits" || arg == "--all")
-		{
-			auto start = chrono::steady_clock::now();
+		auto start = chrono::steady_clock::now();
 
-			dev::test::executeTests("vmInputLimits1", "/VMTests", dev::test::doVMTests);
+		dev::test::executeTests("vmInputLimits1", "/VMTests", dev::test::doVMTests);
 
-			auto end = chrono::steady_clock::now();
-			auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
-			cnote << "test duration: " << duration.count() << " milliseconds.\n";
-		}
+		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(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" || arg == "--all")
-			dev::test::executeTests("vmInputLimits2", "/VMTests", dev::test::doVMTests);
-	}
+	if (test::Options::get().inputLimits)
+		dev::test::executeTests("vmInputLimits2", "/VMTests", dev::test::doVMTests);
 }
 
 BOOST_AUTO_TEST_CASE(vmInputLimitsLightTest)
 {
-	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" || arg == "--all")
-			dev::test::executeTests("vmInputLimitsLight", "/VMTests", dev::test::doVMTests);
-	}
+	if (test::Options::get().inputLimits)
+		dev::test::executeTests("vmInputLimitsLight", "/VMTests", dev::test::doVMTests);
 }
 
 BOOST_AUTO_TEST_CASE(vmRandom)
diff --git a/test/vmArithmeticTestFiller.json b/test/vmArithmeticTestFiller.json
index 81dbf052b..1aae823bd 100644
--- a/test/vmArithmeticTestFiller.json
+++ b/test/vmArithmeticTestFiller.json
@@ -393,6 +393,34 @@
         }
     },
 
+    "mulUnderFlow": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "(asm 1 MUL 01 SSTORE)",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "100000"
+        }
+    },
+
     "sub0": {
         "env" : {
         "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
@@ -1457,6 +1485,34 @@
         }
     },
 
+    "addmodBigIntCast": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (ADDMOD 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 5) } ",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "100000"
+        }
+    },
+
     "addmod1_overflow2": {
         "env" : {
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
@@ -4847,6 +4903,34 @@
         }
     },
 
+    "signextend_Overflow_dj42": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : "0",
+                "code" : "(asm 0x05 JUMP JUMPDEST STOP JUMPDEST 0x8000 DUP1 0x010000000000000001 SIGNEXTEND 0x8001 GT 0x03 JUMPI 0xbadf000d 0x11 SSTORE)",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "1000000"
+        }
+    },
+
     "not1": {
         "env" : {
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
diff --git a/test/vmBlockInfoTestFiller.json b/test/vmBlockInfoTestFiller.json
index c86a9f2cb..2455b2387 100644
--- a/test/vmBlockInfoTestFiller.json
+++ b/test/vmBlockInfoTestFiller.json
@@ -27,6 +27,34 @@
         }
     },
 
+    "blockhashUnderFlow": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "1",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : "1",
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "100000000000000000000000",
+            "nonce" : "0",
+            "code" : "(asm BLOCKHASH)",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "100000"
+        }
+    },
+
     "blockhashMyBlock": {
         "env" : {
         "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
diff --git a/test/vmEnvironmentalInfoTestFiller.json b/test/vmEnvironmentalInfoTestFiller.json
index 4de871d9e..951e65c32 100644
--- a/test/vmEnvironmentalInfoTestFiller.json
+++ b/test/vmEnvironmentalInfoTestFiller.json
@@ -367,6 +367,34 @@
         }
     },
 
+    "calldataload_BigOffset": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "100000000000000000000000",
+                "nonce" : "0",
+                "code" : "{ [[ 0 ]] (CALLDATALOAD 0x4200000000000000000000000000000000000000000000000000000000000000)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x4200000000000000000000000000000000000000000000000000000000000000",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
     "calldataload1": {
         "env" : {
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
@@ -563,6 +591,34 @@
         }
     },
 
+    "calldatacopyUnderFlow": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "100000000000000000000000",
+                "nonce" : "0",
+                "code" : "(asm 1 2 CALLDATACOPY)",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
     "calldatacopyZeroMemExpansion": {
         "env" : {
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
@@ -1129,6 +1185,41 @@
             "gas" : "100000000000"
         }
     },
+
+    "extcodesizeUnderFlow": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : "1",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "100000000000000000000000",
+                "nonce" : "0",
+                "code" : "(asm EXTCODESIZE)",
+                "storage": {}
+            },
+            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
+                "balance" : "100000000000000000000000",
+                "nonce" : "0",
+                "code" : "{  [[ 0 ]] (EQ (EXTCODESIZE (CALLER)) (CODESIZE) ) }",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "123456789",
+            "gas" : "100000000000"
+        }
+    },
+
     "extcodesize1": {
         "env" : {
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
diff --git a/test/webthreestubclient.h b/test/webthreestubclient.h
index 6d97ea67a..4754bbbef 100644
--- a/test/webthreestubclient.h
+++ b/test/webthreestubclient.h
@@ -22,61 +22,61 @@ class WebThreeStubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        std::string eth_coinbase() throw (jsonrpc::JsonRpcException)
+        std::string web3_clientVersion() throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p = Json::nullValue;
-            Json::Value result = this->CallMethod("eth_coinbase",p);
+            Json::Value result = this->CallMethod("web3_clientVersion",p);
             if (result.isString())
                 return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        bool eth_setCoinbase(const std::string& param1) throw (jsonrpc::JsonRpcException)
+        std::string net_version() throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
-            p.append(param1);
-            Json::Value result = this->CallMethod("eth_setCoinbase",p);
-            if (result.isBool())
-                return result.asBool();
+            p = Json::nullValue;
+            Json::Value result = this->CallMethod("net_version",p);
+            if (result.isString())
+                return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        bool eth_listening() throw (jsonrpc::JsonRpcException)
+        std::string net_peerCount() throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p = Json::nullValue;
-            Json::Value result = this->CallMethod("eth_listening",p);
-            if (result.isBool())
-                return result.asBool();
+            Json::Value result = this->CallMethod("net_peerCount",p);
+            if (result.isString())
+                return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        bool eth_setListening(bool param1) throw (jsonrpc::JsonRpcException)
+        bool net_listening() throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
-            p.append(param1);
-            Json::Value result = this->CallMethod("eth_setListening",p);
+            p = Json::nullValue;
+            Json::Value result = this->CallMethod("net_listening",p);
             if (result.isBool())
                 return result.asBool();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        bool eth_mining() throw (jsonrpc::JsonRpcException)
+        std::string eth_coinbase() throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p = Json::nullValue;
-            Json::Value result = this->CallMethod("eth_mining",p);
-            if (result.isBool())
-                return result.asBool();
+            Json::Value result = this->CallMethod("eth_coinbase",p);
+            if (result.isString())
+                return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        bool eth_setMining(bool param1) throw (jsonrpc::JsonRpcException)
+        bool eth_mining() throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
-            p.append(param1);
-            Json::Value result = this->CallMethod("eth_setMining",p);
+            p = Json::nullValue;
+            Json::Value result = this->CallMethod("eth_mining",p);
             if (result.isBool())
                 return result.asBool();
             else
@@ -102,151 +102,116 @@ class WebThreeStubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        int eth_peerCount() throw (jsonrpc::JsonRpcException)
-        {
-            Json::Value p;
-            p = Json::nullValue;
-            Json::Value result = this->CallMethod("eth_peerCount",p);
-            if (result.isInt())
-                return result.asInt();
-            else
-                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-        }
-        int eth_defaultBlock() throw (jsonrpc::JsonRpcException)
+        std::string eth_blockNumber() throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p = Json::nullValue;
-            Json::Value result = this->CallMethod("eth_defaultBlock",p);
-            if (result.isInt())
-                return result.asInt();
-            else
-                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-        }
-        bool eth_setDefaultBlock(int param1) throw (jsonrpc::JsonRpcException)
-        {
-            Json::Value p;
-            p.append(param1);
-            Json::Value result = this->CallMethod("eth_setDefaultBlock",p);
-            if (result.isBool())
-                return result.asBool();
-            else
-                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-        }
-        int eth_number() throw (jsonrpc::JsonRpcException)
-        {
-            Json::Value p;
-            p = Json::nullValue;
-            Json::Value result = this->CallMethod("eth_number",p);
-            if (result.isInt())
-                return result.asInt();
-            else
-                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-        }
-        std::string eth_balanceAt(const std::string& param1) throw (jsonrpc::JsonRpcException)
-        {
-            Json::Value p;
-            p.append(param1);
-            Json::Value result = this->CallMethod("eth_balanceAt",p);
+            Json::Value result = this->CallMethod("eth_blockNumber",p);
             if (result.isString())
                 return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        std::string eth_stateAt(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
+        std::string eth_getBalance(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
             p.append(param2);
-            Json::Value result = this->CallMethod("eth_stateAt",p);
+            Json::Value result = this->CallMethod("eth_getBalance",p);
             if (result.isString())
                 return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        Json::Value eth_storageAt(const std::string& param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_getStorageAt(const std::string& param1, const std::string& param2, const std::string& param3) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_storageAt",p);
-            if (result.isObject())
-                return result;
+            p.append(param2);
+            p.append(param3);
+            Json::Value result = this->CallMethod("eth_getStorageAt",p);
+            if (result.isString())
+                return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        double eth_countAt(const std::string& param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_getTransactionCount(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_countAt",p);
-            if (result.isDouble())
-                return result.asDouble();
+            p.append(param2);
+            Json::Value result = this->CallMethod("eth_getTransactionCount",p);
+            if (result.isString())
+                return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        double eth_transactionCountByHash(const std::string& param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_getBlockTransactionCountByHash(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_transactionCountByHash",p);
-            if (result.isDouble())
-                return result.asDouble();
+            Json::Value result = this->CallMethod("eth_getBlockTransactionCountByHash",p);
+            if (result.isString())
+                return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        double eth_transactionCountByNumber(int param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_getBlockTransactionCountByNumber(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_transactionCountByNumber",p);
-            if (result.isDouble())
-                return result.asDouble();
+            Json::Value result = this->CallMethod("eth_getBlockTransactionCountByNumber",p);
+            if (result.isString())
+                return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        double eth_uncleCountByHash(const std::string& param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_getUncleCountByBlockHash(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_uncleCountByHash",p);
-            if (result.isDouble())
-                return result.asDouble();
+            Json::Value result = this->CallMethod("eth_getUncleCountByBlockHash",p);
+            if (result.isString())
+                return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        double eth_uncleCountByNumber(int param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_getUncleCountByBlockNumber(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_uncleCountByNumber",p);
-            if (result.isDouble())
-                return result.asDouble();
+            Json::Value result = this->CallMethod("eth_getUncleCountByBlockNumber",p);
+            if (result.isString())
+                return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        std::string eth_codeAt(const std::string& param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_getCode(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_codeAt",p);
+            p.append(param2);
+            Json::Value result = this->CallMethod("eth_getCode",p);
             if (result.isString())
                 return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        std::string eth_transact(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_sendTransaction(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_transact",p);
+            Json::Value result = this->CallMethod("eth_sendTransaction",p);
             if (result.isString())
                 return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        std::string eth_call(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_call(const Json::Value& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
+            p.append(param2);
             Json::Value result = this->CallMethod("eth_call",p);
             if (result.isString())
                 return result.asString();
@@ -263,131 +228,143 @@ class WebThreeStubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        Json::Value eth_blockByHash(const std::string& param1) throw (jsonrpc::JsonRpcException)
+        Json::Value eth_getBlockByHash(const std::string& param1, bool param2) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_blockByHash",p);
+            p.append(param2);
+            Json::Value result = this->CallMethod("eth_getBlockByHash",p);
+            if (result.isObject())
+                return result;
+            else
+                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+        }
+        Json::Value eth_getBlockByNumber(const std::string& param1, bool param2) throw (jsonrpc::JsonRpcException)
+        {
+            Json::Value p;
+            p.append(param1);
+            p.append(param2);
+            Json::Value result = this->CallMethod("eth_getBlockByNumber",p);
             if (result.isObject())
                 return result;
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        Json::Value eth_blockByNumber(int param1) throw (jsonrpc::JsonRpcException)
+        Json::Value eth_getTransactionByHash(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_blockByNumber",p);
+            Json::Value result = this->CallMethod("eth_getTransactionByHash",p);
             if (result.isObject())
                 return result;
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        Json::Value eth_transactionByHash(const std::string& param1, int param2) throw (jsonrpc::JsonRpcException)
+        Json::Value eth_getTransactionByBlockHashAndIndex(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
             p.append(param2);
-            Json::Value result = this->CallMethod("eth_transactionByHash",p);
+            Json::Value result = this->CallMethod("eth_getTransactionByBlockHashAndIndex",p);
             if (result.isObject())
                 return result;
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        Json::Value eth_transactionByNumber(int param1, int param2) throw (jsonrpc::JsonRpcException)
+        Json::Value eth_getTransactionByBlockNumberAndIndex(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
             p.append(param2);
-            Json::Value result = this->CallMethod("eth_transactionByNumber",p);
+            Json::Value result = this->CallMethod("eth_getTransactionByBlockNumberAndIndex",p);
             if (result.isObject())
                 return result;
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        Json::Value eth_uncleByHash(const std::string& param1, int param2) throw (jsonrpc::JsonRpcException)
+        Json::Value eth_getUncleByBlockHashAndIndex(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
             p.append(param2);
-            Json::Value result = this->CallMethod("eth_uncleByHash",p);
+            Json::Value result = this->CallMethod("eth_getUncleByBlockHashAndIndex",p);
             if (result.isObject())
                 return result;
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        Json::Value eth_uncleByNumber(int param1, int param2) throw (jsonrpc::JsonRpcException)
+        Json::Value eth_getUncleByBlockNumberAndIndex(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
             p.append(param2);
-            Json::Value result = this->CallMethod("eth_uncleByNumber",p);
+            Json::Value result = this->CallMethod("eth_getUncleByBlockNumberAndIndex",p);
             if (result.isObject())
                 return result;
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        Json::Value eth_compilers() throw (jsonrpc::JsonRpcException)
+        Json::Value eth_getCompilers() throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p = Json::nullValue;
-            Json::Value result = this->CallMethod("eth_compilers",p);
+            Json::Value result = this->CallMethod("eth_getCompilers",p);
             if (result.isArray())
                 return result;
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        std::string eth_lll(const std::string& param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_compileLLL(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_lll",p);
+            Json::Value result = this->CallMethod("eth_compileLLL",p);
             if (result.isString())
                 return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        std::string eth_solidity(const std::string& param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_compileSerpent(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_solidity",p);
+            Json::Value result = this->CallMethod("eth_compileSerpent",p);
             if (result.isString())
                 return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        std::string eth_serpent(const std::string& param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_compileSolidity(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_serpent",p);
+            Json::Value result = this->CallMethod("eth_compileSolidity",p);
             if (result.isString())
                 return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        int eth_newFilter(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_newFilter(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
             Json::Value result = this->CallMethod("eth_newFilter",p);
-            if (result.isInt())
-                return result.asInt();
+            if (result.isString())
+                return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        int eth_newFilterString(const std::string& param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_newBlockFilter(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_newFilterString",p);
-            if (result.isInt())
-                return result.asInt();
+            Json::Value result = this->CallMethod("eth_newBlockFilter",p);
+            if (result.isString())
+                return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        bool eth_uninstallFilter(int param1) throw (jsonrpc::JsonRpcException)
+        bool eth_uninstallFilter(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
@@ -397,31 +374,31 @@ class WebThreeStubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        Json::Value eth_changed(int param1) throw (jsonrpc::JsonRpcException)
+        Json::Value eth_getFilterChanges(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_changed",p);
+            Json::Value result = this->CallMethod("eth_getFilterChanges",p);
             if (result.isArray())
                 return result;
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        Json::Value eth_filterLogs(int param1) throw (jsonrpc::JsonRpcException)
+        Json::Value eth_getFilterLogs(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_filterLogs",p);
+            Json::Value result = this->CallMethod("eth_getFilterLogs",p);
             if (result.isArray())
                 return result;
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        Json::Value eth_logs(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
+        Json::Value eth_getLogs(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_logs",p);
+            Json::Value result = this->CallMethod("eth_getLogs",p);
             if (result.isArray())
                 return result;
             else
@@ -448,17 +425,17 @@ class WebThreeStubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        int eth_register(const std::string& param1) throw (jsonrpc::JsonRpcException)
+        std::string eth_register(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
             Json::Value result = this->CallMethod("eth_register",p);
-            if (result.isInt())
-                return result.asInt();
+            if (result.isString())
+                return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        bool eth_unregister(int param1) throw (jsonrpc::JsonRpcException)
+        bool eth_unregister(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
@@ -468,11 +445,11 @@ class WebThreeStubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        Json::Value eth_queuedTransactions(int param1) throw (jsonrpc::JsonRpcException)
+        Json::Value eth_fetchQueuedTransactions(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("eth_queuedTransactions",p);
+            Json::Value result = this->CallMethod("eth_fetchQueuedTransactions",p);
             if (result.isArray())
                 return result;
             else
@@ -501,29 +478,6 @@ class WebThreeStubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        bool db_putString(const std::string& param1, const std::string& param2, const std::string& param3) throw (jsonrpc::JsonRpcException)
-        {
-            Json::Value p;
-            p.append(param1);
-            p.append(param2);
-            p.append(param3);
-            Json::Value result = this->CallMethod("db_putString",p);
-            if (result.isBool())
-                return result.asBool();
-            else
-                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-        }
-        std::string db_getString(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
-        {
-            Json::Value p;
-            p.append(param1);
-            p.append(param2);
-            Json::Value result = this->CallMethod("db_getString",p);
-            if (result.isString())
-                return result.asString();
-            else
-                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-        }
         bool shh_post(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
@@ -544,11 +498,11 @@ class WebThreeStubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        bool shh_haveIdentity(const std::string& param1) throw (jsonrpc::JsonRpcException)
+        bool shh_hasIdentity(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("shh_haveIdentity",p);
+            Json::Value result = this->CallMethod("shh_hasIdentity",p);
             if (result.isBool())
                 return result.asBool();
             else
@@ -576,17 +530,17 @@ class WebThreeStubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        int shh_newFilter(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
+        std::string shh_newFilter(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
             Json::Value result = this->CallMethod("shh_newFilter",p);
-            if (result.isInt())
-                return result.asInt();
+            if (result.isString())
+                return result.asString();
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        bool shh_uninstallFilter(int param1) throw (jsonrpc::JsonRpcException)
+        bool shh_uninstallFilter(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
@@ -596,17 +550,17 @@ class WebThreeStubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        Json::Value shh_changed(int param1) throw (jsonrpc::JsonRpcException)
+        Json::Value shh_getFilterChanges(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
-            Json::Value result = this->CallMethod("shh_changed",p);
+            Json::Value result = this->CallMethod("shh_getFilterChanges",p);
             if (result.isArray())
                 return result;
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-        Json::Value shh_getMessages(int param1) throw (jsonrpc::JsonRpcException)
+        Json::Value shh_getMessages(const std::string& param1) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
             p.append(param1);
diff --git a/third/MainWin.cpp b/third/MainWin.cpp
index 210fabe47..a1074cddb 100644
--- a/third/MainWin.cpp
+++ b/third/MainWin.cpp
@@ -540,7 +540,7 @@ void Main::timerEvent(QTimerEvent*)
 
 	for (auto const& i: m_handlers)
 	{
-		auto ls = ethereum()->checkWatch(i.first);
+		auto ls = ethereum()->checkWatchSafe(i.first);
 		if (ls.size())
 			i.second(ls);
 	}