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

alethzero/MainWin.cpp

@@ -107,10 +107,11 @@ Main::Main(QWidget *parent) :
 #endif
 	m_servers.append(QString::fromStdString(Host::pocHost() + ":30303"));
 
-    cerr << "State root: " << BlockChain::genesis().stateRoot << endl;
+	cerr << "State root: " << BlockChain::genesis().stateRoot << endl;
-    cerr << "Block Hash: " << sha3(BlockChain::createGenesisBlock()) << endl;
+	cerr << "Block Hash: " << sha3(BlockChain::createGenesisBlock()) << endl;
-    cerr << "Block RLP: " << RLP(BlockChain::createGenesisBlock()) << endl;
+	auto block = BlockChain::createGenesisBlock();
-    cerr << "Block Hex: " << toHex(BlockChain::createGenesisBlock()) << endl;
+	cerr << "Block RLP: " << RLP(block) << endl;
+	cerr << "Block Hex: " << toHex(BlockChain::createGenesisBlock()) << endl;
 	cerr << "Network protocol version: " << dev::eth::c_protocolVersion << endl;
 	cerr << "Client database version: " << dev::eth::c_databaseVersion << endl;
 
@@ -462,7 +463,7 @@ QString Main::lookup(QString const& _a) const
 
 void Main::on_about_triggered()
 {
-	QMessageBox::about(this, "About AlethZero PoC-" + QString(dev::Version).section('.', 1, 1), QString("AlethZero/v") + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM) "\n" DEV_QUOTED(ETH_COMMIT_HASH) + (ETH_CLEAN_REPO ? "\nCLEAN" : "\n+ LOCAL CHANGES") + "\n\nBy Gav Wood, 2014.\nThis software wouldn't be where it is today without the many leaders & contributors including:\n\nVitalik Buterin, Tim Hughes, caktux, Nick Savers, Eric Lombrozo, Marko Simovic, the many testers and the Berlin \304\220\316\236V team.");
+	QMessageBox::about(this, "About AlethZero PoC-" + QString(dev::Version).section('.', 1, 1), QString("AlethZero/v") + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM) "\n" DEV_QUOTED(ETH_COMMIT_HASH) + (ETH_CLEAN_REPO ? "\nCLEAN" : "\n+ LOCAL CHANGES") + "\n\nBy Gav Wood, 2014.\nBased on a design by Vitalik Buterin.\n\nThanks to the various contributors including: Alex Leverington, Tim Hughes, caktux, Eric Lombrozo, Marko Simovic.");
 }
 
 void Main::on_paranoia_triggered()
@@ -614,10 +615,14 @@ void Main::on_importKeyFile_triggered()
 				QMessageBox::warning(this, "Already Have Key", "Could not import the secret key: we already own this account.");
 		}
 		else
-			throw 0;
+			BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("encseed type is not js::str_type") );
+
 	}
 	catch (...)
 	{
+		cerr << "Unhandled exception!" << endl <<
+			boost::current_exception_diagnostic_information();
+
 		QMessageBox::warning(this, "Key File Invalid", "Could not find secret key definition. This is probably not an Ethereum key file.");
 	}
 }
@@ -1631,7 +1636,8 @@ void Main::on_debug_clicked()
 	}
 	catch (dev::Exception const& _e)
 	{
-		statusBar()->showMessage("Error running transaction: " + QString::fromStdString(_e.description()));
+		statusBar()->showMessage("Error running transaction: " + QString::fromStdString(diagnostic_information(_e)));
+		// this output is aimed at developers, reconsider using _e.what for more user friendly output.
 	}
 }
 
@@ -1917,6 +1923,8 @@ void Main::updateDebugger()
 					}
 					catch (...)
 					{
+						cerr << "Unhandled exception!" << endl <<
+									boost::current_exception_diagnostic_information();
 						break;	// probably hit data segment
 					}
 				}

libdevcore/Common.h

@@ -39,7 +39,7 @@
 #include <boost/multiprecision/cpp_int.hpp>
 #include "vector_ref.h"
 
-// CryptoPP defines byte in the global namespace, so so must we.
+// CryptoPP defines byte in the global namespace, so must we.
 using byte = uint8_t;
 
 // Quote a given token stream to turn it into a string.

libdevcore/CommonData.cpp

@@ -23,6 +23,7 @@
 
 #include <random>
 #include "Exceptions.h"
+#include <libdevcore/Log.h>
 using namespace std;
 using namespace dev;
 
@@ -67,7 +68,7 @@ int dev::fromHex(char _i)
 		return _i - 'a' + 10;
 	if (_i >= 'A' && _i <= 'F')
 		return _i - 'A' + 10;
-	throw BadHexCharacter();
+	BOOST_THROW_EXCEPTION(BadHexCharacter() << errinfo_invalidSymbol(_i));
 }
 
 bytes dev::fromHex(std::string const& _s)
@@ -81,13 +82,13 @@ bytes dev::fromHex(std::string const& _s)
 		{
 			ret.push_back(fromHex(_s[s++]));
 		}
-		catch (...){ ret.push_back(0); }
+		catch (...){ ret.push_back(0); cwarn << boost::current_exception_diagnostic_information(); }
 	for (unsigned i = s; i < _s.size(); i += 2)
 		try
 		{
 			ret.push_back((byte)(fromHex(_s[i]) * 16 + fromHex(_s[i + 1])));
 		}
-		catch (...){ ret.push_back(0); }
+		catch (...){ ret.push_back(0); cwarn << boost::current_exception_diagnostic_information(); }
 	return ret;
 }
 

libdevcore/Exceptions.h

@@ -22,27 +22,29 @@
 #pragma once
 
 #include <exception>
+#include <boost/exception/all.hpp>
+#include <boost/throw_exception.hpp>
+#include <libdevcrypto/Common.h>
 #include "CommonIO.h"
 #include "CommonData.h"
 #include "FixedHash.h"
 
 namespace dev
 {
-
+// base class for all exceptions
-class Exception: public std::exception
+struct Exception: virtual std::exception, virtual boost::exception {};
-{
+
-public:
+struct BadHexCharacter: virtual Exception {};
-	virtual std::string description() const { return typeid(*this).name(); }
+struct RLPException: virtual Exception {};
-	virtual char const* what() const noexcept { return typeid(*this).name(); }
+struct BadCast: virtual RLPException {};
-};
+struct BadRLP: virtual RLPException {};
-
+struct NoNetworking: virtual Exception {};
-class BadHexCharacter: public Exception {};
+struct NoUPnPDevice: virtual Exception {};
-
+struct RootNotFound: virtual Exception {};
-class RLPException: public Exception {};
+struct FileError: virtual Exception {};
-class BadCast: public RLPException {};
+
-class BadRLP: public RLPException {};
+// error information to be added to exceptions
-class NoNetworking: public Exception {};
+typedef boost::error_info<struct tag_invalidSymbol, char> errinfo_invalidSymbol;
-class NoUPnPDevice: public Exception {};
+typedef boost::error_info<struct tag_comment, Address> errinfo_wrongAddress;
-class RootNotFound: public Exception {};
+typedef boost::error_info<struct tag_comment, std::string> errinfo_comment;
-
 }

libdevcore/RLP.cpp

@@ -104,13 +104,13 @@ bool RLP::isInt() const
 	else if (n <= c_rlpDataIndLenZero)
 	{
 		if (m_data.size() <= 1)
-			throw BadRLP();
+			BOOST_THROW_EXCEPTION(BadRLP());
 		return m_data[1] != 0;
 	}
 	else if (n < c_rlpListStart)
 	{
 		if ((int)m_data.size() <= 1 + n - c_rlpDataIndLenZero)
-			throw BadRLP();
+			BOOST_THROW_EXCEPTION(BadRLP());
 		return m_data[1 + n - c_rlpDataIndLenZero] != 0;
 	}
 	else
@@ -131,7 +131,7 @@ unsigned RLP::length() const
 	else if (n < c_rlpListStart)
 	{
 		if ((int)m_data.size() <= n - c_rlpDataIndLenZero)
-			throw BadRLP();
+			BOOST_THROW_EXCEPTION(BadRLP());
 		for (int i = 0; i < n - c_rlpDataIndLenZero; ++i)
 			ret = (ret << 8) | m_data[i + 1];
 	}
@@ -140,7 +140,7 @@ unsigned RLP::length() const
 	else
 	{
 		if ((int)m_data.size() <= n - c_rlpListIndLenZero)
-			throw BadRLP();
+			BOOST_THROW_EXCEPTION(BadRLP());
 		for (int i = 0; i < n - c_rlpListIndLenZero; ++i)
 			ret = (ret << 8) | m_data[i + 1];
 	}
@@ -176,7 +176,8 @@ void RLPStream::noteAppended(unsigned _itemCount)
 //	cdebug << "noteAppended(" << _itemCount << ")";
 	while (m_listStack.size())
 	{
-		assert(m_listStack.back().first >= _itemCount);
+		if (m_listStack.back().first < _itemCount)
+			BOOST_THROW_EXCEPTION(RLPException() << errinfo_comment("itemCount too large"));
 		m_listStack.back().first -= _itemCount;
 		if (m_listStack.back().first)
 			break;

libdevcore/RLP.h

@@ -100,11 +100,11 @@ public:
 
 	/// @returns the number of items in the list, or zero if it isn't a list.
 	unsigned itemCount() const { return isList() ? items() : 0; }
-	unsigned itemCountStrict() const { if (!isList()) throw BadCast(); return items(); }
+	unsigned itemCountStrict() const { if (!isList()) BOOST_THROW_EXCEPTION(BadCast()); return items(); }
 
 	/// @returns the number of bytes in the data, or zero if it isn't data.
 	unsigned size() const { return isData() ? length() : 0; }
-	unsigned sizeStrict() const { if (!isData()) throw BadCast(); return length(); }
+	unsigned sizeStrict() const { if (!isData()) BOOST_THROW_EXCEPTION(BadCast()); return length(); }
 
 	/// Equality operators; does best-effort conversion and checks for equality.
 	bool operator==(char const* _s) const { return isData() && toString() == _s; }
@@ -175,7 +175,7 @@ public:
 	/// Converts to string. @returns the empty string if not a string.
 	std::string toString() const { if (!isData()) return std::string(); return payload().cropped(0, length()).toString(); }
 	/// Converts to string. @throws BadCast if not a string.
-	std::string toStringStrict() const { if (!isData()) throw BadCast(); return payload().cropped(0, length()).toString(); }
+	std::string toStringStrict() const { if (!isData()) BOOST_THROW_EXCEPTION(BadCast()); return payload().cropped(0, length()).toString(); }
 
 	template <class T>
 	std::vector<T> toVector() const
@@ -222,7 +222,7 @@ public:
 	std::array<T, N> toArray() const
 	{
 		if (itemCount() != N || !isList())
-			throw BadCast();
+			BOOST_THROW_EXCEPTION(BadCast());
 		std::array<T, N> ret;
 		for (unsigned i = 0; i < N; ++i)
 		{
@@ -246,7 +246,7 @@ public:
 	{
 		if ((!isInt() && !(_flags & AllowNonCanon)) || isList() || isNull())
 			if (_flags & ThrowOnFail)
-				throw BadCast();
+				BOOST_THROW_EXCEPTION(BadCast());
 			else
 				return 0;
 		else {}
@@ -254,7 +254,7 @@ public:
 		auto p = payload();
 		if (p.size() > intTraits<_T>::maxSize && (_flags & FailIfTooBig))
 			if (_flags & ThrowOnFail)
-				throw BadCast();
+				BOOST_THROW_EXCEPTION(BadCast());
 			else
 				return 0;
 		else {}
@@ -266,7 +266,7 @@ public:
 	{
 		if (!isData() || (length() > _N::size && (_flags & FailIfTooBig)))
 			if (_flags & ThrowOnFail)
-				throw BadCast();
+				BOOST_THROW_EXCEPTION(BadCast());
 			else
 				return _N();
 		else{}
@@ -288,6 +288,9 @@ public:
 	unsigned actualSize() const;
 
 private:
+	/// Disable construction from rvalue
+	explicit RLP(bytes const&& _d) {}
+
 	/// Single-byte data payload.
 	bool isSingleByte() const { return !isNull() && m_data[0] < c_rlpDataImmLenStart; }
 
@@ -361,10 +364,10 @@ public:
 	void clear() { m_out.clear(); m_listStack.clear(); }
 
 	/// Read the byte stream.
-	bytes const& out() const { assert(m_listStack.empty()); return m_out; }
+	bytes const& out() const { if(!m_listStack.empty()) BOOST_THROW_EXCEPTION(RLPException() << errinfo_comment("listStack is not empty")); return m_out; }
 
 	/// Swap the contents of the output stream out for some other byte array.
-	void swapOut(bytes& _dest) { assert(m_listStack.empty()); swap(m_out, _dest); }
+	void swapOut(bytes& _dest) { if(!m_listStack.empty()) BOOST_THROW_EXCEPTION(RLPException() << errinfo_comment("listStack is not empty")); swap(m_out, _dest); }
 
 private:
 	void noteAppended(unsigned _itemCount = 1);

libdevcrypto/FileSystem.cpp

@@ -43,7 +43,7 @@ std::string dev::getDataDir()
 	#ifndef _MSC_VER // todo?
 		cwarn << "getDataDir(): SHGetSpecialFolderPathA() failed.";
 	#endif
-		throw std::runtime_error("getDataDir() - SHGetSpecialFolderPathA() failed.");
+		BOOST_THROW_EXCEPTION(std::runtime_error("getDataDir() - SHGetSpecialFolderPathA() failed."));
 	}
 #else
 	boost::filesystem::path dataDirPath;

libdevcrypto/TrieDB.h

@@ -30,6 +30,7 @@
 #include <memory>
 #include <libdevcore/Common.h>
 #include <libdevcore/Log.h>
+#include <libdevcore/Exceptions.h>
 #include <libdevcrypto/SHA3.h>
 #include "MemoryDB.h"
 #include "OverlayDB.h"
@@ -44,7 +45,7 @@ namespace eth
 struct TrieDBChannel: public LogChannel  { static const char* name() { return "-T-"; } static const int verbosity = 6; };
 #define tdebug clog(TrieDBChannel)
 
-class InvalidTrie: public std::exception {};
+struct InvalidTrie: virtual dev::Exception {};
 extern const h256 c_shaNull;
 
 /**
@@ -81,7 +82,7 @@ public:
 
 		/*std::cout << "Setting root to " << _root << " (patched to " << m_root << ")" << std::endl;*/
 		if (!node(m_root).size())
-			throw RootNotFound();
+			BOOST_THROW_EXCEPTION(RootNotFound());
 	}
 	bool haveRoot(h256 _root, bool _enforceRefs = true) { return _root == h256() ? true : m_db->lookup(_root, _enforceRefs).size(); }
 
@@ -109,7 +110,7 @@ public:
 		else if (_r.isList())
 			descendList(_r, _keyMask, _wasExt, _out, _indent);
 		else
-			throw InvalidTrie();
+			BOOST_THROW_EXCEPTION(InvalidTrie());
 	}
 
 	void descendList(RLP const& _r, std::set<h256>& _keyMask, bool _wasExt, std::ostream* _out, int _indent) const
@@ -130,7 +131,7 @@ public:
 					descendEntry(_r[i], _keyMask, false, _out, _indent + 1);
 		}
 		else
-			throw InvalidTrie();
+			BOOST_THROW_EXCEPTION(InvalidTrie());
 	}
 
 	std::set<h256> leftOvers(std::ostream* _out = nullptr) const
@@ -153,6 +154,7 @@ public:
 		}
 		catch (...)
 		{
+			cwarn << boost::current_exception_diagnostic_information();
 			return false;
 		}
 	}
@@ -374,7 +376,7 @@ template <class DB> void GenericTrieDB<DB>::iterator::next()
 				cwarn << rlp;
 				auto c = rlp.itemCount();
 				cwarn << c;
-				throw InvalidTrie();
+				BOOST_THROW_EXCEPTION(InvalidTrie());
 #else
 				m_that = nullptr;
 				return;
@@ -553,11 +555,17 @@ template <class DB> bytes GenericTrieDB<DB>::mergeAt(RLP const& _orig, NibbleSli
 		auto sh = _k.shared(k);
 //		std::cout << _k << " sh " << k << " = " << sh << std::endl;
 		if (sh)
+		{
 			// shared stuff - cleve at disagreement.
-			return mergeAt(RLP(cleve(_orig, sh)), _k, _v, true);
+			auto cleved = cleve(_orig, sh);
+			return mergeAt(RLP(cleved), _k, _v, true);
+		}
 		else
+		{
 			// nothing shared - branch
-			return mergeAt(RLP(branch(_orig)), _k, _v, true);
+			auto branched = branch(_orig);
+			return mergeAt(RLP(branched), _k, _v, true);
+		}
 	}
 	else
 	{
@@ -686,7 +694,10 @@ template <class DB> bytes GenericTrieDB<DB>::deleteAt(RLP const& _orig, NibbleSl
 			byte used = uniqueInUse(_orig, 16);
 			if (used != 255)
 				if (isTwoItemNode(_orig[used]))
-					return graft(RLP(merge(_orig, used)));
+				{
+					auto merged = merge(_orig, used);
+					return graft(RLP(merged));
+				}
 				else
 					return merge(_orig, used);
 			else
@@ -722,7 +733,10 @@ template <class DB> bytes GenericTrieDB<DB>::deleteAt(RLP const& _orig, NibbleSl
 
 			// yes; merge
 			if (isTwoItemNode(rlp[used]))
-				return graft(RLP(merge(rlp, used)));
+			{
+				auto merged = merge(rlp, used);
+				return graft(RLP(merged));
+			}
 			else
 				return merge(rlp, used);
 		}

libethcore/BlockInfo.cpp

@@ -91,20 +91,22 @@ void BlockInfo::populateFromHeader(RLP const& _header, bool _checkNonce)
 		extraData = _header[field = 11].toBytes();
 		nonce = _header[field = 12].toHash<h256>();
 	}
-	catch (RLPException const&)
+
+	catch (Exception & _e)
 	{
-		throw InvalidBlockHeaderFormat(field, _header[field].data());
+		_e << errinfo_name("invalid block header format") << BadFieldError(field, toHex(_header[field].data().toBytes()));
+		throw;
 	}
 
 	// check it hashes according to proof of work or that it's the genesis block.
 	if (_checkNonce && parentHash && !Dagger::verify(headerHashWithoutNonce(), nonce, difficulty))
-		throw InvalidBlockNonce(headerHashWithoutNonce(), nonce, difficulty);
+		BOOST_THROW_EXCEPTION(InvalidBlockNonce(headerHashWithoutNonce(), nonce, difficulty));
 
 	if (gasUsed > gasLimit)
-		throw TooMuchGasUsed();
+		BOOST_THROW_EXCEPTION(TooMuchGasUsed());
 
 	if (number && extraData.size() > 1024)
-		throw ExtraDataTooBig();
+		BOOST_THROW_EXCEPTION(ExtraDataTooBig());
 }
 
 void BlockInfo::populate(bytesConstRef _block, bool _checkNonce)
@@ -113,13 +115,13 @@ void BlockInfo::populate(bytesConstRef _block, bool _checkNonce)
 	RLP header = root[0];
 
 	if (!header.isList())
-		throw InvalidBlockFormat(0, header.data());
+		BOOST_THROW_EXCEPTION(InvalidBlockFormat(0,header.data()));
 	populateFromHeader(header, _checkNonce);
 
 	if (!root[1].isList())
-		throw InvalidBlockFormat(1, root[1].data());
+		BOOST_THROW_EXCEPTION(InvalidBlockFormat(1, root[1].data()));
 	if (!root[2].isList())
-		throw InvalidBlockFormat(2, root[2].data());
+		BOOST_THROW_EXCEPTION(InvalidBlockFormat(2, root[2].data()));
 }
 
 void BlockInfo::verifyInternals(bytesConstRef _block) const
@@ -141,13 +143,13 @@ void BlockInfo::verifyInternals(bytesConstRef _block) const
 		++i;
 	}
 	if (transactionsRoot != t.root())
-		throw InvalidTransactionsHash(t.root(), transactionsRoot);
+		BOOST_THROW_EXCEPTION(InvalidTransactionsHash(t.root(), transactionsRoot));
 
 	if (minGasPrice > mgp)
-		throw InvalidMinGasPrice(minGasPrice, mgp);
+		BOOST_THROW_EXCEPTION(InvalidMinGasPrice(minGasPrice, mgp));
 
 	if (sha3Uncles != sha3(root[2].data()))
-		throw InvalidUnclesHash();
+		BOOST_THROW_EXCEPTION(InvalidUnclesHash());
 }
 
 void BlockInfo::populateFromParent(BlockInfo const& _parent)
@@ -180,22 +182,22 @@ void BlockInfo::verifyParent(BlockInfo const& _parent) const
 {
 	// Check difficulty is correct given the two timestamps.
 	if (difficulty != calculateDifficulty(_parent))
-		throw InvalidDifficulty();
+		BOOST_THROW_EXCEPTION(InvalidDifficulty());
 
 	if (gasLimit != calculateGasLimit(_parent))
-		throw InvalidGasLimit(gasLimit, calculateGasLimit(_parent));
+		BOOST_THROW_EXCEPTION(InvalidGasLimit(gasLimit, calculateGasLimit(_parent)));
 
 	// Check timestamp is after previous timestamp.
 	if (parentHash)
 	{
 		if (parentHash != _parent.hash)
-			throw InvalidParentHash();
+			BOOST_THROW_EXCEPTION(InvalidParentHash());
 
 		if (timestamp < _parent.timestamp)
-			throw InvalidTimestamp();
+			BOOST_THROW_EXCEPTION(InvalidTimestamp());
 
 		if (number != _parent.number + 1)
-			throw InvalidNumber();
+			BOOST_THROW_EXCEPTION(InvalidNumber());
 	}
 }
 

libethcore/Exceptions.h

@@ -7,40 +7,42 @@ namespace dev
 namespace eth
 {
 
-class DatabaseAlreadyOpen: public dev::Exception {};
+// information to add to exceptions
+typedef boost::error_info<struct tag_field, std::string> errinfo_name;
+typedef boost::error_info<struct tag_field, int> errinfo_field;
+typedef boost::error_info<struct tag_data, std::string> errinfo_data;
+typedef boost::tuple<errinfo_field, errinfo_data> BadFieldError;
 
-class NotEnoughCash: public dev::Exception {};
+struct DatabaseAlreadyOpen: virtual dev::Exception {};
-
+struct NotEnoughCash: virtual dev::Exception {};
-class GasPriceTooLow: public dev::Exception {};
+struct GasPriceTooLow: virtual dev::Exception {};
-class BlockGasLimitReached: public dev::Exception {};
+struct BlockGasLimitReached: virtual dev::Exception {};
-class NoSuchContract: public dev::Exception {};
+struct NoSuchContract: virtual dev::Exception {};
-class ContractAddressCollision: public dev::Exception {};
+struct ContractAddressCollision: virtual dev::Exception {};
-class FeeTooSmall: public dev::Exception {};
+struct FeeTooSmall: virtual dev::Exception {};
-class TooMuchGasUsed: public dev::Exception {};
+struct TooMuchGasUsed: virtual dev::Exception {};
-class ExtraDataTooBig: public dev::Exception {};
+struct ExtraDataTooBig: virtual dev::Exception {};
-class InvalidSignature: public dev::Exception {};
+struct InvalidSignature: virtual dev::Exception {};
-class InvalidTransactionFormat: public dev::Exception { public: InvalidTransactionFormat(int _f, bytesConstRef _d): m_f(_f), m_d(_d.toBytes()) {} int m_f; bytes m_d; virtual std::string description() const { return "Invalid transaction format: Bad field " + toString(m_f) + " (" + toHex(m_d) + ")"; } };
+class InvalidBlockFormat: public dev::Exception { public: InvalidBlockFormat(int _f, bytesConstRef _d): m_f(_f), m_d(_d.toBytes()) {} int m_f; bytes m_d; virtual const char* what() const noexcept { return ("Invalid block format: Bad field " + toString(m_f) + " (" + toHex(m_d) + ")").c_str(); } };
-class InvalidBlockFormat: public dev::Exception { public: InvalidBlockFormat(int _f, bytesConstRef _d): m_f(_f), m_d(_d.toBytes()) {} int m_f; bytes m_d; virtual std::string description() const { return "Invalid block format: Bad field " + toString(m_f) + " (" + toHex(m_d) + ")"; } };
+struct InvalidUnclesHash: virtual dev::Exception {};
-class InvalidBlockHeaderFormat: public dev::Exception { public: InvalidBlockHeaderFormat(int _f, bytesConstRef _d): m_f(_f), m_d(_d.toBytes()) {} int m_f; bytes m_d; virtual std::string description() const { return "Invalid block header format: Bad field " + toString(m_f) + " (" + toHex(m_d) + ")"; } };
+struct InvalidUncle: virtual dev::Exception {};
-class InvalidUnclesHash: public dev::Exception {};
+struct UncleTooOld: virtual dev::Exception {};
-class InvalidUncle: public dev::Exception {};
+class UncleInChain: public dev::Exception { public: UncleInChain(h256Set _uncles, h256 _block): m_uncles(_uncles), m_block(_block) {} h256Set m_uncles; h256 m_block;virtual const char* what() const noexcept { return ("Uncle in block already mentioned: Uncles " + toString(m_uncles) + " (" + m_block.abridged() + ")").c_str(); } };
-class UncleTooOld: public dev::Exception {};
+struct DuplicateUncleNonce: virtual dev::Exception {};
-class UncleInChain: public dev::Exception { public: UncleInChain(h256Set _uncles, h256 _block): m_uncles(_uncles), m_block(_block) {} h256Set m_uncles; h256 m_block; virtual std::string description() const { return "Uncle in block already mentioned: Uncles " + toString(m_uncles) + " (" + m_block.abridged() + ")"; } };
+struct InvalidStateRoot: virtual dev::Exception {};
-class DuplicateUncleNonce: public dev::Exception {};
+class InvalidTransactionsHash: public dev::Exception { public: InvalidTransactionsHash(h256 _head, h256 _real): m_head(_head), m_real(_real) {} h256 m_head; h256 m_real; virtual const char* what() const noexcept { return ("Invalid transactions hash:  header says: " + toHex(m_head.ref()) + " block is:" + toHex(m_real.ref())).c_str(); } };
-class InvalidStateRoot: public dev::Exception {};
+struct InvalidTransaction: virtual dev::Exception {};
-class InvalidTransactionsHash: public dev::Exception { public: InvalidTransactionsHash(h256 _head, h256 _real): m_head(_head), m_real(_real) {} h256 m_head; h256 m_real; virtual std::string description() const { return "Invalid transactions hash:  header says: " + toHex(m_head.ref()) + " block is:" + toHex(m_real.ref()); } };
+struct InvalidDifficulty: virtual dev::Exception {};
-class InvalidTransaction: public dev::Exception {};
+class InvalidGasLimit: public dev::Exception { public: InvalidGasLimit(u256 _provided = 0, u256 _valid = 0): provided(_provided), valid(_valid) {} u256 provided; u256 valid; virtual const char* what() const noexcept { return ("Invalid gas limit (provided: " + toString(provided) + " valid:" + toString(valid) + ")").c_str(); } };
-class InvalidDifficulty: public dev::Exception {};
+class InvalidMinGasPrice: public dev::Exception { public: InvalidMinGasPrice(u256 _provided = 0, u256 _limit = 0): provided(_provided), limit(_limit) {} u256 provided; u256 limit; virtual const char* what() const noexcept { return ("Invalid minimum gas price (provided: " + toString(provided) + " limit:" + toString(limit) + ")").c_str(); } };
-class InvalidGasLimit: public dev::Exception { public: InvalidGasLimit(u256 _provided = 0, u256 _valid = 0): provided(_provided), valid(_valid) {} u256 provided; u256 valid; virtual std::string description() const { return "Invalid gas limit (provided: " + toString(provided) + " valid:" + toString(valid) + ")"; } };
+struct InvalidTransactionGasUsed: virtual dev::Exception {};
-class InvalidMinGasPrice: public dev::Exception { public: InvalidMinGasPrice(u256 _provided = 0, u256 _limit = 0): provided(_provided), limit(_limit) {} u256 provided; u256 limit; virtual std::string description() const { return "Invalid minimum gas price (provided: " + toString(provided) + " limit:" + toString(limit) + ")"; } };
+struct InvalidTransactionStateRoot: virtual dev::Exception {};
-class InvalidTransactionGasUsed: public dev::Exception {};
+struct InvalidTimestamp: virtual dev::Exception {};
-class InvalidTransactionStateRoot: public dev::Exception {};
+class InvalidNonce: public dev::Exception { public: InvalidNonce(u256 _required = 0, u256 _candidate = 0): required(_required), candidate(_candidate) {} u256 required; u256 candidate; virtual const char* what() const noexcept { return ("Invalid nonce (r: " + toString(required) + " c:" + toString(candidate) + ")").c_str(); } };
-class InvalidTimestamp: public dev::Exception {};
+class InvalidBlockNonce: public dev::Exception { public: InvalidBlockNonce(h256 _h = h256(), h256 _n = h256(), u256 _d = 0): h(_h), n(_n), d(_d) {} h256 h; h256 n; u256 d; virtual const char* what() const noexcept { return ("Invalid nonce (h: " + toString(h) + " n:" + toString(n) + " d:" + toString(d) + ")").c_str(); } };
-class InvalidNonce: public dev::Exception { public: InvalidNonce(u256 _required = 0, u256 _candidate = 0): required(_required), candidate(_candidate) {} u256 required; u256 candidate; virtual std::string description() const { return "Invalid nonce (r: " + toString(required) + " c:" + toString(candidate) + ")"; } };
+struct InvalidParentHash: virtual dev::Exception {};
-class InvalidBlockNonce: public dev::Exception { public: InvalidBlockNonce(h256 _h = h256(), h256 _n = h256(), u256 _d = 0): h(_h), n(_n), d(_d) {} h256 h; h256 n; u256 d; virtual std::string description() const { return "Invalid nonce (h: " + toString(h) + " n:" + toString(n) + " d:" + toString(d) + ")"; } };
+struct InvalidNumber: virtual dev::Exception {};
-class InvalidParentHash: public dev::Exception {};
+struct InvalidContractAddress: virtual dev::Exception {};
-class InvalidNumber: public dev::Exception {};
-class InvalidContractAddress: public dev::Exception {};
 
 }
 }

libethereum/BlockChain.cpp

@@ -137,9 +137,9 @@ void BlockChain::open(std::string _path, bool _killExisting)
 	ldb::DB::Open(o, _path + "/blocks", &m_db);
 	ldb::DB::Open(o, _path + "/details", &m_extrasDB);
 	if (!m_db)
-		throw DatabaseAlreadyOpen();
+		BOOST_THROW_EXCEPTION(DatabaseAlreadyOpen());
 	if (!m_extrasDB)
-		throw DatabaseAlreadyOpen();
+		BOOST_THROW_EXCEPTION(DatabaseAlreadyOpen());
 
 	if (!details(m_genesisHash))
 	{
@@ -211,12 +211,12 @@ h256s BlockChain::sync(BlockQueue& _bq, OverlayDB const& _stateDB, unsigned _max
 		}
 		catch (UnknownParent)
 		{
-			cwarn << "Unknown parent of block!!!" << BlockInfo::headerHash(block).abridged();
+			cwarn << "Unknown parent of block!!!" << BlockInfo::headerHash(block).abridged() << boost::current_exception_diagnostic_information();
 			_bq.import(&block, *this);
 		}
 		catch (Exception const& _e)
 		{
-			cwarn << "Unexpected exception!" << _e.description();
+			cwarn << "Unexpected exception!" << diagnostic_information(_e);
 			_bq.import(&block, *this);
 		}
 		catch (...)
@@ -234,6 +234,7 @@ h256s BlockChain::attemptImport(bytes const& _block, OverlayDB const& _stateDB)
 	}
 	catch (...)
 	{
+		cwarn << "Unexpected exception! Could not import block!" << boost::current_exception_diagnostic_information();
 		return h256s();
 	}
 }
@@ -253,7 +254,8 @@ h256s BlockChain::import(bytes const& _block, OverlayDB const& _db)
 #if ETH_CATCH
 	catch (Exception const& _e)
 	{
-		clog(BlockChainNote) << "   Malformed block (" << _e.description() << ").";
+		clog(BlockChainNote) << "   Malformed block: " << diagnostic_information(_e);
+		_e << errinfo_comment("Malformed block ");
 		throw;
 	}
 #endif
@@ -263,7 +265,7 @@ h256s BlockChain::import(bytes const& _block, OverlayDB const& _db)
 	if (isKnown(newHash))
 	{
 		clog(BlockChainNote) << newHash << ": Not new.";
-		throw AlreadyHaveBlock();
+		BOOST_THROW_EXCEPTION(AlreadyHaveBlock());
 	}
 
 	// Work out its number as the parent's number + 1
@@ -271,14 +273,16 @@ h256s BlockChain::import(bytes const& _block, OverlayDB const& _db)
 	{
 		clog(BlockChainNote) << newHash << ": Unknown parent " << bi.parentHash;
 		// We don't know the parent (yet) - discard for now. It'll get resent to us if we find out about its ancestry later on.
-		throw UnknownParent();
+		BOOST_THROW_EXCEPTION(UnknownParent());
 	}
 
 	auto pd = details(bi.parentHash);
 	if (!pd)
 	{
-		cwarn << "Odd: details is returning false despite block known:" << RLP(pd.rlp());
+		auto pdata = pd.rlp();
-		cwarn << "Block:" << RLP(block(bi.parentHash));
+		cwarn << "Odd: details is returning false despite block known:" << RLP(pdata);
+		auto parentBlock = block(bi.parentHash);
+		cwarn << "Block:" << RLP(parentBlock);
 	}
 
 	// Check it's not crazy
@@ -286,7 +290,7 @@ h256s BlockChain::import(bytes const& _block, OverlayDB const& _db)
 	{
 		clog(BlockChainNote) << newHash << ": Future time " << bi.timestamp << " (now at " << time(0) << ")";
 		// Block has a timestamp in the future. This is no good.
-		throw FutureTime();
+		BOOST_THROW_EXCEPTION(FutureTime());
 	}
 
 	clog(BlockChainNote) << "Attempting import of " << newHash.abridged() << "...";
@@ -342,7 +346,8 @@ h256s BlockChain::import(bytes const& _block, OverlayDB const& _db)
 #if ETH_CATCH
 	catch (Exception const& _e)
 	{
-		clog(BlockChainNote) << "   Malformed block (" << _e.description() << ").";
+		clog(BlockChainNote) << "   Malformed block: " << diagnostic_information(_e);
+		_e << errinfo_comment("Malformed block ");
 		throw;
 	}
 #endif
@@ -447,7 +452,8 @@ h256Set BlockChain::allUnclesFrom(h256 _parent) const
 	for (unsigned i = 0; i < 6 && p != m_genesisHash; ++i, p = details(p).parent)
 	{
 		ret.insert(p);		// TODO: check: should this be details(p).parent?
-		for (auto i: RLP(block(p))[2])
+		auto b = block(p);
+		for (auto i: RLP(b)[2])
 			ret.insert(sha3(i.data()));
 	}
 	return ret;

libethereum/BlockChain.h

@@ -28,6 +28,7 @@
 
 #include <mutex>
 #include <libdevcore/Log.h>
+#include <libdevcore/Exceptions.h>
 #include <libethcore/CommonEth.h>
 #include <libethcore/BlockInfo.h>
 #include <libdevcore/Guards.h>
@@ -46,9 +47,9 @@ static const h256s NullH256s;
 class State;
 class OverlayDB;
 
-class AlreadyHaveBlock: public std::exception {};
+struct AlreadyHaveBlock: virtual Exception {};
-class UnknownParent: public std::exception {};
+struct UnknownParent: virtual Exception {};
-class FutureTime: public std::exception {};
+struct FutureTime: virtual Exception {};
 
 struct BlockChainChat: public LogChannel { static const char* name() { return "-B-"; } static const int verbosity = 7; };
 struct BlockChainNote: public LogChannel { static const char* name() { return "=B="; } static const int verbosity = 4; };

libethereum/BlockQueue.cpp

@@ -58,7 +58,7 @@ bool BlockQueue::import(bytesConstRef _block, BlockChain const& _bc)
 #if ETH_CATCH
 	catch (Exception const& _e)
 	{
-		cwarn << "Ignoring malformed block: " << _e.description();
+		cwarn << "Ignoring malformed block: " << diagnostic_information(_e);
 		return false;
 	}
 #endif

libethereum/Client.cpp

@@ -36,7 +36,9 @@ using namespace p2p;
 VersionChecker::VersionChecker(string const& _dbPath):
 	m_path(_dbPath.size() ? _dbPath : Defaults::dbPath())
 {
-	m_ok = RLP(contents(m_path + "/protocol")).toInt<unsigned>(RLP::LaisezFaire) == c_protocolVersion && RLP(contents(m_path + "/database")).toInt<unsigned>(RLP::LaisezFaire) == c_databaseVersion;
+	auto protocolContents = contents(m_path + "/protocol");
+	auto databaseContents = contents(m_path + "/database");
+	m_ok = RLP(protocolContents).toInt<unsigned>(RLP::LaisezFaire) == c_protocolVersion && RLP(databaseContents).toInt<unsigned>(RLP::LaisezFaire) == c_databaseVersion;
 }
 
 void VersionChecker::setOk()
@@ -47,7 +49,10 @@ void VersionChecker::setOk()
 		{
 			boost::filesystem::create_directory(m_path);
 		}
-		catch (...) {}
+		catch (...)
+		{
+			cwarn << "Unhandled exception! Failed to create directory: " << m_path << "\n" << boost::current_exception_diagnostic_information();
+		}
 		writeFile(m_path + "/protocol", rlp(c_protocolVersion));
 		writeFile(m_path + "/database", rlp(c_databaseVersion));
 	}

libethereum/Executive.cpp

@@ -54,14 +54,14 @@ bool Executive::setup(bytesConstRef _rlp)
 	if (m_t.nonce != nonceReq)
 	{
 		clog(StateChat) << "Invalid Nonce: Require" << nonceReq << " Got" << m_t.nonce;
-		throw InvalidNonce(nonceReq, m_t.nonce);
+		BOOST_THROW_EXCEPTION(InvalidNonce(nonceReq, m_t.nonce));
 	}
 
 	// Don't like transactions whose gas price is too low. NOTE: this won't stay here forever - it's just until we get a proper gas price discovery protocol going.
 	if (m_t.gasPrice < m_s.m_currentBlock.minGasPrice)
 	{
 		clog(StateChat) << "Offered gas-price is too low: Require >" << m_s.m_currentBlock.minGasPrice << " Got" << m_t.gasPrice;
-		throw GasPriceTooLow();
+		BOOST_THROW_EXCEPTION(GasPriceTooLow());
 	}
 
 	// Check gas cost is enough.
@@ -70,7 +70,7 @@ bool Executive::setup(bytesConstRef _rlp)
 	if (m_t.gas < gasCost)
 	{
 		clog(StateChat) << "Not enough gas to pay for the transaction: Require >" << gasCost << " Got" << m_t.gas;
-		throw OutOfGas();
+		BOOST_THROW_EXCEPTION(OutOfGas());
 	}
 
 	u256 cost = m_t.value + m_t.gas * m_t.gasPrice;
@@ -79,14 +79,14 @@ bool Executive::setup(bytesConstRef _rlp)
 	if (m_s.balance(m_sender) < cost)
 	{
 		clog(StateChat) << "Not enough cash: Require >" << cost << " Got" << m_s.balance(m_sender);
-		throw NotEnoughCash();
+		BOOST_THROW_EXCEPTION(NotEnoughCash());
 	}
 
 	u256 startGasUsed = m_s.gasUsed();
 	if (startGasUsed + m_t.gas > m_s.m_currentBlock.gasLimit)
 	{
 		clog(StateChat) << "Too much gas used in this block: Require <" << (m_s.m_currentBlock.gasLimit - startGasUsed) << " Got" << m_t.gas;
-		throw BlockGasLimitReached();
+		BOOST_THROW_EXCEPTION(BlockGasLimitReached());
 	}
 
 	// Increment associated nonce for sender.
@@ -184,12 +184,12 @@ bool Executive::go(OnOpFunc const& _onOp)
 		}
 		catch (VMException const& _e)
 		{
-			clog(StateChat) << "VM Exception: " << _e.description();
+			clog(StateChat) << "VM Exception: " << diagnostic_information(_e);
 			m_endGas = m_vm->gas();
 		}
 		catch (Exception const& _e)
 		{
-			clog(StateChat) << "Exception in VM: " << _e.description();
+			clog(StateChat) << "Exception in VM: " << diagnostic_information(_e);
 		}
 		catch (std::exception const& _e)
 		{

libethereum/State.cpp

@@ -54,7 +54,7 @@ OverlayDB State::openDB(std::string _path, bool _killExisting)
 	ldb::DB* db = nullptr;
 	ldb::DB::Open(o, _path + "/state", &db);
 	if (!db)
-		throw DatabaseAlreadyOpen();
+		BOOST_THROW_EXCEPTION(DatabaseAlreadyOpen());
 
 	cnote << "Opened state DB.";
 	return OverlayDB(db);
@@ -133,7 +133,7 @@ void State::paranoia(std::string const& _when, bool _enforceRefs) const
 	if (!isTrieGood(_enforceRefs, false))
 	{
 		cwarn << "BAD TRIE" << _when;
-		throw InvalidTrie();
+		BOOST_THROW_EXCEPTION(InvalidTrie());
 	}
 #else
 	(void)_when;
@@ -334,7 +334,7 @@ bool State::sync(BlockChain const& _bc, h256 _block, BlockInfo const& _bi)
 			{
 				// TODO: Slightly nicer handling? :-)
 				cerr << "ERROR: Corrupt block-chain! Delete your block-chain DB and restart." << endl;
-				cerr << _e.description() << endl;
+				cerr << diagnostic_information(_e) << endl;
 			}
 			catch (std::exception const& _e)
 			{
@@ -386,6 +386,7 @@ bool State::sync(BlockChain const& _bc, h256 _block, BlockInfo const& _bi)
 		{
 			// TODO: Slightly nicer handling? :-)
 			cerr << "ERROR: Corrupt block-chain! Delete your block-chain DB and restart." << endl;
+			cerr << boost::current_exception_diagnostic_information() << endl;
 			exit(1);
 		}
 
@@ -503,6 +504,14 @@ h256s State::sync(TransactionQueue& _tq, bool* o_transactionQueueChanged)
 					else
 						_tq.setFuture(i);
 				}
+				catch (Exception const& _e)
+				{
+					// Something else went wrong - drop it.
+					_tq.drop(i.first);
+					if (o_transactionQueueChanged)
+						*o_transactionQueueChanged = true;
+					cwarn << "Sync went wrong\n" << diagnostic_information(_e);
+				}
 				catch (std::exception const&)
 				{
 					// Something else went wrong - drop it.
@@ -527,7 +536,7 @@ u256 State::enact(bytesConstRef _block, BlockChain const* _bc, bool _checkNonce)
 #endif
 
 	if (m_currentBlock.parentHash != m_previousBlock.hash)
-		throw InvalidParentHash();
+		BOOST_THROW_EXCEPTION(InvalidParentHash());
 
 	// Populate m_currentBlock with the correct values.
 	m_currentBlock.populate(_block, _checkNonce);
@@ -553,10 +562,10 @@ u256 State::enact(bytesConstRef _block, BlockChain const* _bc, bool _checkNonce)
 			cnote << m_state.root() << "\n" << m_state;
 			cnote << *this;
 			cnote << "INVALID: " << tr[1].toHash<h256>();
-			throw InvalidTransactionStateRoot();
+			BOOST_THROW_EXCEPTION(InvalidTransactionStateRoot());
 		}
 		if (tr[2].toInt<u256>() != gasUsed())
-			throw InvalidTransactionGasUsed();
+			BOOST_THROW_EXCEPTION(InvalidTransactionGasUsed());
 		bytes k = rlp(i);
 		transactionManifest.insert(&k, tr.data());
 		++i;
@@ -565,7 +574,7 @@ u256 State::enact(bytesConstRef _block, BlockChain const* _bc, bool _checkNonce)
 	if (m_currentBlock.transactionsRoot && transactionManifest.root() != m_currentBlock.transactionsRoot)
 	{
 		cwarn << "Bad transactions state root!";
-		throw InvalidTransactionStateRoot();
+		BOOST_THROW_EXCEPTION(InvalidTransactionStateRoot());
 	}
 
 	// Initialise total difficulty calculation.
@@ -578,16 +587,16 @@ u256 State::enact(bytesConstRef _block, BlockChain const* _bc, bool _checkNonce)
 	for (auto const& i: RLP(_block)[2])
 	{
 		if (knownUncles.count(sha3(i.data())))
-			throw UncleInChain(knownUncles, sha3(i.data()));
+			BOOST_THROW_EXCEPTION(UncleInChain(knownUncles, sha3(i.data()) ));
 
 		BlockInfo uncle = BlockInfo::fromHeader(i.data());
 		if (nonces.count(uncle.nonce))
-			throw DuplicateUncleNonce();
+			BOOST_THROW_EXCEPTION(DuplicateUncleNonce());
 		if (_bc)
 		{
 			BlockInfo uncleParent(_bc->block(uncle.parentHash));
 			if ((bigint)uncleParent.number < (bigint)m_currentBlock.number - 6)
-				throw UncleTooOld();
+				BOOST_THROW_EXCEPTION(UncleTooOld());
 			uncle.verifyParent(uncleParent);
 		}
 
@@ -611,7 +620,7 @@ u256 State::enact(bytesConstRef _block, BlockChain const* _bc, bool _checkNonce)
 		cnote << *this;
 		// Rollback the trie.
 		m_db.rollback();
-		throw InvalidStateRoot();
+		BOOST_THROW_EXCEPTION(InvalidStateRoot());
 	}
 
 	return tdIncrease;
@@ -677,13 +686,13 @@ bool State::amIJustParanoid(BlockChain const& _bc)
 		s.cleanup(false);
 		return true;
 	}
-	catch (Exception const& e)
+	catch (Exception const& _e)
 	{
-		cwarn << "Bad block: " << e.description();
+		cwarn << "Bad block: " << diagnostic_information(_e);
 	}
-	catch (std::exception const& e)
+	catch (std::exception const& _e)
 	{
-		cwarn << "Bad block: " << e.what();
+		cwarn << "Bad block: " << _e.what();
 	}
 
 	return false;
@@ -863,7 +872,7 @@ void State::subBalance(Address _id, bigint _amount)
 	ensureCached(_id, false, false);
 	auto it = m_cache.find(_id);
 	if (it == m_cache.end() || (bigint)it->second.balance() < _amount)
-		throw NotEnoughCash();
+		BOOST_THROW_EXCEPTION(NotEnoughCash());
 	else
 		it->second.addBalance(-_amount);
 }
@@ -1038,7 +1047,7 @@ u256 State::execute(bytesConstRef _rlp, bytes* o_output, bool _commit)
 		if (storageRoot(e.t().receiveAddress) && m_db.lookup(storageRoot(e.t().receiveAddress)).empty())
 		{
 			cwarn << "TRIE immediately after execution; no node for receiveAddress";
-			throw InvalidTrie();
+			BOOST_THROW_EXCEPTION(InvalidTrie());
 		}
 	}
 #endif
@@ -1093,11 +1102,11 @@ bool State::call(Address _receiveAddress, Address _codeAddress, Address _senderA
 		}
 		catch (VMException const& _e)
 		{
-			clog(StateChat) << "VM Exception: " << _e.description();
+			clog(StateChat) << "VM Exception: " << diagnostic_information(_e);
 		}
 		catch (Exception const& _e)
 		{
-			clog(StateChat) << "Exception in VM: " << _e.description();
+			clog(StateChat) << "Exception in VM: " << diagnostic_information(_e);
 		}
 		catch (std::exception const& _e)
 		{
@@ -1160,11 +1169,11 @@ h160 State::create(Address _sender, u256 _endowment, u256 _gasPrice, u256* _gas,
 	}
 	catch (VMException const& _e)
 	{
-		clog(StateChat) << "VM Exception: " << _e.description();
+		clog(StateChat) << "VM Exception: " << diagnostic_information(_e);
 	}
 	catch (Exception const& _e)
 	{
-		clog(StateChat) << "Exception in VM: " << _e.description();
+		clog(StateChat) << "Exception in VM: " << diagnostic_information(_e);
 	}
 	catch (std::exception const& _e)
 	{

libethereum/State.h

@@ -40,6 +40,8 @@
 
 namespace dev
 {
+namespace test{ class FakeExtVM;}
+
 namespace eth
 {
 
@@ -75,6 +77,7 @@ struct TransactionReceipt
 class State
 {
 	friend class ExtVM;
+	friend class test::FakeExtVM;
 	friend class Executive;
 
 public:

libethereum/Transaction.cpp

@@ -46,9 +46,10 @@ Transaction::Transaction(bytesConstRef _rlpData, bool _checkSender)
 		if (_checkSender)
 			m_sender = sender();
 	}
-	catch (RLPException const&)
+	catch (Exception & _e)
 	{
-		throw InvalidTransactionFormat(field, rlp[field].data());
+		_e << errinfo_name("invalid transaction format") << BadFieldError(field,toHex(rlp[field].data().toBytes()));
+		throw;
 	}
 }
 
@@ -60,6 +61,7 @@ Address Transaction::safeSender() const noexcept
 	}
 	catch (...)
 	{
+		cwarn << "safeSender() did throw an exception: " <<  boost::current_exception_diagnostic_information();
 		return Address();
 	}
 }
@@ -76,7 +78,7 @@ Address Transaction::sender() const
 		byte pubkey[65];
 		int pubkeylen = 65;
 		if (!secp256k1_ecdsa_recover_compact(msg.data(), 32, sig[0].data(), pubkey, &pubkeylen, 0, (int)vrs.v - 27))
-			throw InvalidSignature();
+			BOOST_THROW_EXCEPTION(InvalidSignature());
 
 		// TODO: check right160 is correct and shouldn't be left160.
 		m_sender = right160(dev::eth::sha3(bytesConstRef(&(pubkey[1]), 64)));
@@ -103,7 +105,7 @@ void Transaction::sign(Secret _priv)
 	h256 nonce = kFromMessage(msg, _priv);
 
 	if (!secp256k1_ecdsa_sign_compact(msg.data(), 32, sig[0].data(), _priv.data(), nonce.data(), &v))
-		throw InvalidSignature();
+		BOOST_THROW_EXCEPTION(InvalidSignature());
 #if ETH_ADDRESS_DEBUG
 	cout << "---- SIGN -------------------------------" << endl;
 	cout << "MSG: " << msg << endl;

libethereum/TransactionQueue.cpp

@@ -49,9 +49,9 @@ bool TransactionQueue::import(bytesConstRef _transactionRLP)
 		m_current[h] = _transactionRLP.toBytes();
 		m_known.insert(h);
 	}
-	catch (InvalidTransactionFormat const& _e)
+	catch (Exception const& _e)
 	{
-		cwarn << "Ignoring invalid transaction: " << _e.description();
+		cwarn << "Ignoring invalid transaction: " <<  diagnostic_information(_e);
 		return false;
 	}
 	catch (std::exception const& _e)

libevm/VM.h

@@ -35,11 +35,11 @@ namespace dev
 namespace eth
 {
 
-class VMException: public Exception {};
+struct VMException: virtual Exception {};
-class StepsDone: public VMException {};
+struct StepsDone: virtual VMException {};
-class BreakPointHit: public VMException {};
+struct BreakPointHit: virtual VMException {};
-class BadInstruction: public VMException {};
+struct BadInstruction: virtual VMException {};
-class OutOfGas: public VMException {};
+struct OutOfGas: virtual VMException {};
 class StackTooSmall: public VMException { public: StackTooSmall(u256 _req, u256 _got): req(_req), got(_got) {} u256 req; u256 got; };
 
 // Convert from a 256-bit integer stack/memory entry into a 160-bit Address hash.
@@ -70,7 +70,7 @@ public:
 	template <class Ext>
 	bytesConstRef go(Ext& _ext, OnOpFunc const& _onOp = OnOpFunc(), uint64_t _steps = (uint64_t)-1);
 
-	void require(u256 _n) { if (m_stack.size() < _n) throw StackTooSmall(_n, m_stack.size()); }
+	void require(u256 _n) { if (m_stack.size() < _n) BOOST_THROW_EXCEPTION(StackTooSmall(_n, m_stack.size())); }
 	void requireMem(unsigned _n) { if (m_temp.size() < _n) { m_temp.resize(_n); } }
 	u256 gas() const { return m_gas; }
 	u256 curPC() const { return m_curPC; }
@@ -208,7 +208,7 @@ template <class Ext> dev::bytesConstRef dev::eth::VM::go(Ext& _ext, OnOpFunc con
 		{
 			// Out of gas!
 			m_gas = 0;
-			throw OutOfGas();
+			BOOST_THROW_EXCEPTION(OutOfGas());
 		}
 
 		m_gas = (u256)((bigint)m_gas - runGas);
@@ -686,11 +686,11 @@ template <class Ext> dev::bytesConstRef dev::eth::VM::go(Ext& _ext, OnOpFunc con
 			break;
 		}
 		default:
-			throw BadInstruction();
+			BOOST_THROW_EXCEPTION(BadInstruction());
 		}
 	}
 	if (_steps == (uint64_t)-1)
-		throw StepsDone();
+		BOOST_THROW_EXCEPTION(StepsDone());
 	return bytesConstRef();
 }
 }

libevmface/Instruction.cpp

@@ -22,6 +22,7 @@
 #include "Instruction.h"
 
 #include <libdevcore/Common.h>
+#include <libdevcore/Log.h>
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
@@ -312,6 +313,7 @@ InstructionInfo dev::eth::instructionInfo(Instruction _inst)
 	}
 	catch (...)
 	{
+		cwarn << "<INVALID_INSTRUCTION: " << toString((unsigned)_inst) << ">\n" << boost::current_exception_diagnostic_information();
 		return InstructionInfo({"<INVALID_INSTRUCTION: " + toString((unsigned)_inst) + ">", 0, 0, 0});
 	}
 }

liblll/Assembly.cpp

@@ -102,7 +102,7 @@ void Assembly::append(Assembly const& _a)
 void Assembly::append(Assembly const& _a, int _deposit)
 {
 	if (_deposit > _a.m_deposit)
-		throw InvalidDeposit();
+		BOOST_THROW_EXCEPTION(InvalidDeposit());
 	else
 	{
 		append(_a);

liblll/Assembly.h

@@ -111,7 +111,7 @@ public:
 	std::ostream& streamOut(std::ostream& _out, std::string const& _prefix = "") const;
 
 private:
-	void donePath() { if (m_totalDeposit != INT_MAX && m_totalDeposit != m_deposit) throw InvalidDeposit(); }
+	void donePath() { if (m_totalDeposit != INT_MAX && m_totalDeposit != m_deposit) BOOST_THROW_EXCEPTION(InvalidDeposit()); }
 	unsigned bytesRequired() const;
 
 	unsigned m_usedTags = 0;

liblll/CodeFragment.h

@@ -50,7 +50,7 @@ public:
 private:
 	void finalise(CompilerState const& _cs);
 
-	template <class T> void error() const { throw T(); }
+	template <class T> void error() const { BOOST_THROW_EXCEPTION(T() ); }
 	void constructOperation(sp::utree const& _t, CompilerState& _s);
 
 	bool m_finalised = false;

liblll/Compiler.cpp

@@ -43,7 +43,10 @@ bytes dev::eth::compileLLL(string const& _src, bool _opt, vector<string>* _error
 	catch (Exception const& _e)
 	{
 		if (_errors)
-			_errors->push_back(_e.description());
+		{
+			_errors->push_back("Parse error.");
+			_errors->push_back(diagnostic_information(_e));
+		}
 	}
 	catch (std::exception)
 	{
@@ -67,7 +70,7 @@ std::string dev::eth::compileLLLToAsm(std::string const& _src, bool _opt, std::v
 	catch (Exception const& _e)
 	{
 		if (_errors)
-			_errors->push_back(_e.description());
+			_errors->push_back(diagnostic_information(_e));
 	}
 	catch (std::exception)
 	{

liblll/Parser.cpp

@@ -140,6 +140,6 @@ void dev::eth::parseTreeLLL(string const& _s, sp::utree& o_out)
 	qi::phrase_parse(ret, s.cend(), element, space, qi::skip_flag::dont_postskip, o_out);
 	for (auto i = ret; i != s.cend(); ++i)
 		if (!isspace(*i))
-			throw std::exception();
+			BOOST_THROW_EXCEPTION(std::exception());
 }
 

libp2p/Host.cpp

@@ -96,7 +96,7 @@ void Host::start()
 		{
 			if (i)
 			{
-				cwarn << "Couldn't start accepting connections on host. Something very wrong with network?";
+				cwarn << "Couldn't start accepting connections on host. Something very wrong with network?\n" << boost::current_exception_diagnostic_information();
 				return;
 			}
 			m_acceptor.close();
@@ -238,14 +238,14 @@ void Host::populateAddresses()
 #ifdef _WIN32
 	WSAData wsaData;
 	if (WSAStartup(MAKEWORD(1, 1), &wsaData) != 0)
-		throw NoNetworking();
+		BOOST_THROW_EXCEPTION(NoNetworking());
 
 	char ac[80];
 	if (gethostname(ac, sizeof(ac)) == SOCKET_ERROR)
 	{
 		clog(NetWarn) << "Error " << WSAGetLastError() << " when getting local host name.";
 		WSACleanup();
-		throw NoNetworking();
+		BOOST_THROW_EXCEPTION(NoNetworking());
 	}
 
 	struct hostent* phe = gethostbyname(ac);
@@ -253,7 +253,7 @@ void Host::populateAddresses()
 	{
 		clog(NetWarn) << "Bad host lookup.";
 		WSACleanup();
-		throw NoNetworking();
+		BOOST_THROW_EXCEPTION(NoNetworking());
 	}
 
 	for (int i = 0; phe->h_addr_list[i] != 0; ++i)
@@ -273,7 +273,7 @@ void Host::populateAddresses()
 #else
 	ifaddrs* ifaddr;
 	if (getifaddrs(&ifaddr) == -1)
-		throw NoNetworking();
+		BOOST_THROW_EXCEPTION(NoNetworking());
 
 	bi::tcp::resolver r(m_ioService);
 
@@ -341,6 +341,7 @@ void Host::ensureAccepting()
 		m_acceptor.async_accept(m_socket, [=](boost::system::error_code ec)
 		{
 			if (!ec)
+			{
 				try
 				{
 					try {
@@ -351,10 +352,15 @@ void Host::ensureAccepting()
 					auto p = std::make_shared<Session>(this, std::move(m_socket), remoteAddress);
 					p->start();
 				}
+				catch (Exception const& _e)
+				{
+					clog(NetWarn) << "ERROR: " << diagnostic_information(_e);
+				}
 				catch (std::exception const& _e)
 				{
 					clog(NetWarn) << "ERROR: " << _e.what();
 				}
+			}
 			m_accepting = false;
 			if (ec.value() < 1)
 				ensureAccepting();
@@ -372,6 +378,7 @@ string Host::pocHost()
 void Host::connect(std::string const& _addr, unsigned short _port) noexcept
 {
 	for (int i = 0; i < 2; ++i)
+	{
 		try
 		{
 			if (i == 0)
@@ -383,11 +390,17 @@ void Host::connect(std::string const& _addr, unsigned short _port) noexcept
 				connect(bi::tcp::endpoint(bi::address::from_string(_addr), _port));
 			break;
 		}
+		catch (Exception const& _e)
+		{
+			// Couldn't connect
+			clog(NetConnect) << "Bad host " << _addr << "\n" << diagnostic_information(_e);
+		}
 		catch (exception const& e)
 		{
 			// Couldn't connect
 			clog(NetConnect) << "Bad host " << _addr << " (" << e.what() << ")";
 		}
+	}
 }
 
 void Host::connect(bi::tcp::endpoint const& _ep)

libp2p/Session.cpp

@@ -418,7 +418,7 @@ void Session::doRead()
 			}
 			catch (Exception const& _e)
 			{
-				clogS(NetWarn) << "ERROR: " << _e.description();
+				clogS(NetWarn) << "ERROR: " << diagnostic_information(_e);
 				dropped();
 			}
 			catch (std::exception const& _e)

libp2p/UPnP.cpp

@@ -87,7 +87,7 @@ UPnP::UPnP()
 #endif
 	{
 		cnote << "UPnP device not found.";
-		throw NoUPnPDevice();
+		BOOST_THROW_EXCEPTION(NoUPnPDevice());
 	}
 }
 

libserpent/util.cpp

@@ -219,8 +219,8 @@ void err(std::string errtext, Metadata met) {
     std::string err = "Error (file \"" + met.file + "\", line " +
         unsignedToDecimal(met.ln + 1) + ", char " + unsignedToDecimal(met.ch) +
         "): " + errtext;
-    std::cerr << err << "\n";
+	std::cerr << err << "\n";
-    throw(err);
+	throw(err);
 }
 
 //Bin to hex

libwebthree/WebThree.h

@@ -38,7 +38,7 @@
 namespace dev
 {
 
-class InterfaceNotSupported: public Exception { public: InterfaceNotSupported(std::string _f): m_f(_f) {} virtual std::string description() const { return "Interface " + m_f + " not supported."; } private: std::string m_f; };
+class InterfaceNotSupported: public Exception { public: InterfaceNotSupported(std::string _f): m_f(_f) {} virtual const char* what() const noexcept { return ("Interface " + m_f + " not supported.").c_str(); } private: std::string m_f; };
 
 enum WorkState
 {
@@ -73,9 +73,9 @@ public:
 
 	// The mainline interfaces:
 
-	eth::Client* ethereum() const { if (!m_ethereum) throw InterfaceNotSupported("eth"); return m_ethereum.get(); }
+	eth::Client* ethereum() const { if (!m_ethereum) BOOST_THROW_EXCEPTION(InterfaceNotSupported("eth")); return m_ethereum.get(); }
-	std::shared_ptr<shh::WhisperHost> whisper() const { auto w = m_whisper.lock(); if (!w) throw InterfaceNotSupported("shh"); return w; }
+	std::shared_ptr<shh::WhisperHost> whisper() const { auto w = m_whisper.lock(); if (!w) BOOST_THROW_EXCEPTION(InterfaceNotSupported("shh")); return w; }
-	bzz::Interface* swarm() const { throw InterfaceNotSupported("bzz"); }
+	bzz::Interface* swarm() const { BOOST_THROW_EXCEPTION(InterfaceNotSupported("bzz")); }
 
 	// Misc stuff:
 
@@ -183,9 +183,9 @@ public:
 
 	// The mainline interfaces.
 
-	eth::Interface* ethereum() const { if (!m_ethereum) throw InterfaceNotSupported("eth"); return m_ethereum; }
+	eth::Interface* ethereum() const { if (!m_ethereum) BOOST_THROW_EXCEPTION(InterfaceNotSupported("eth")); return m_ethereum; }
-	shh::Interface* whisper() const { if (!m_whisper) throw InterfaceNotSupported("shh"); return m_whisper; }
+	shh::Interface* whisper() const { if (!m_whisper) BOOST_THROW_EXCEPTION(InterfaceNotSupported("shh")); return m_whisper; }
-	bzz::Interface* swarm() const { throw InterfaceNotSupported("bzz"); }
+	bzz::Interface* swarm() const { BOOST_THROW_EXCEPTION(InterfaceNotSupported("bzz")); }
 
 	// Peer network stuff - forward through RPCSlave, probably with P2PNetworkSlave/Master classes like Whisper & Ethereum.
 

neth/main.cpp

@@ -805,9 +805,9 @@ int main(int argc, char** argv)
 
 					cnote << "Saved" << rechex << "to" << outFile;
 				}
-				catch (dev::eth::InvalidTrie)
+				catch (dev::eth::InvalidTrie const& _e)
 				{
-					cwarn << "Corrupted trie.";
+					cwarn << "Corrupted trie.\n" << diagnostic_information(_e);
 				}
 			}
 		}

sc/cmdline.cpp

@@ -5,104 +5,98 @@
 #include <map>
 #include <string>
 #include <libserpent/funcs.h>
+#include <libdevcore/Exceptions.h>
 
-int main(int argv, char** argc) {
+int main(int argv, char** argc)
-    if (argv == 1) {
+{
-        std::cerr << "Must provide a command and arguments! Try parse, rewrite, compile, assemble\n";
+	if (argv == 1)
-        return 0;
+	{
-    }
+		std::cerr << "Must provide a command and arguments! Try parse, rewrite, compile, assemble\n";
-    std::string flag = "";
+		return 0;
-    std::string command = argc[1];
+	}
-    std::string input;
+	std::string flag = "";
-    std::string secondInput;
+	std::string command = argc[1];
-    if (std::string(argc[1]) == "-s") {
+	std::string input;
-        flag = command.substr(1);
+	std::string secondInput;
-        command = argc[2];
+	if (std::string(argc[1]) == "-s")
-        input = "";
+	{
-        std::string line;
+		flag = command.substr(1);
-        while (std::getline(std::cin, line)) {
+		command = argc[2];
-            input += line + "\n";
+		input = "";
-        }
+		std::string line;
-        secondInput = argv == 3 ? "" : argc[3];
+		while (std::getline(std::cin, line))
-    }
+		{
-    else {
+			input += line + "\n";
-        if (argv == 2) {
+		}
-            std::cerr << "Not enough arguments for serpent cmdline\n";
+		secondInput = argv == 3 ? "" : argc[3];
-            throw(0);
+	}
-        }
+	else
-        input = argc[2];
+	{
-        secondInput = argv == 3 ? "" : argc[3];
+		if (argv == 2)
-    }
+		{
-    bool haveSec = secondInput.length() > 0;
+			std::cerr << "Not enough arguments for serpent cmdline\n";
-    if (command == "parse" || command == "parse_serpent") {
+			BOOST_THROW_EXCEPTION(dev::Exception() << dev::errinfo_comment("Not enough arguments for serpent cmdline"));
-        std::cout << printAST(parseSerpent(input), haveSec) << "\n";
+		}
-    }
+		input = argc[2];
-    else if (command == "rewrite") {
+		secondInput = argv == 3 ? "" : argc[3];
-        std::cout << printAST(rewrite(parseLLL(input, true)), haveSec) << "\n";
+	}
-    }
+	bool haveSec = secondInput.length() > 0;
-    else if (command == "compile_to_lll") {
+	if (command == "parse" || command == "parse_serpent")
-        std::cout << printAST(compileToLLL(input), haveSec) << "\n";
+		std::cout << printAST(parseSerpent(input), haveSec) << "\n";
-    }
+	else if (command == "rewrite")
-    else if (command == "build_fragtree") {
+		std::cout << printAST(rewrite(parseLLL(input, true)), haveSec) << "\n";
-        std::cout << printAST(buildFragmentTree(parseLLL(input, true))) << "\n";
+	else if (command == "compile_to_lll")
-    }
+		std::cout << printAST(compileToLLL(input), haveSec) << "\n";
-    else if (command == "compile_lll") {
+	else if (command == "build_fragtree")
-        std::cout << binToHex(compileLLL(parseLLL(input, true))) << "\n";
+		std::cout << printAST(buildFragmentTree(parseLLL(input, true))) << "\n";
-    }
+	else if (command == "compile_lll")
-    else if (command == "dereference") {
+		std::cout << binToHex(compileLLL(parseLLL(input, true))) << "\n";
-        std::cout << printAST(dereference(parseLLL(input, true)), haveSec) <<"\n";
+	else if (command == "dereference")
-    }
+		std::cout << printAST(dereference(parseLLL(input, true)), haveSec) <<"\n";
-    else if (command == "pretty_assemble") {
+	else if (command == "pretty_assemble")
-        std::cout << printTokens(prettyAssemble(parseLLL(input, true))) <<"\n";
+		std::cout << printTokens(prettyAssemble(parseLLL(input, true))) <<"\n";
-    }
+	else if (command == "pretty_compile_lll")
-    else if (command == "pretty_compile_lll") {
+		std::cout << printTokens(prettyCompileLLL(parseLLL(input, true))) << "\n";
-        std::cout << printTokens(prettyCompileLLL(parseLLL(input, true))) << "\n";
+	else if (command == "pretty_compile")
-    }
+		std::cout << printTokens(prettyCompile(input)) << "\n";
-    else if (command == "pretty_compile") {
+	else if (command == "assemble")
-        std::cout << printTokens(prettyCompile(input)) << "\n";
+		std::cout << assemble(parseLLL(input, true)) << "\n";
-    }
+	else if (command == "serialize")
-    else if (command == "assemble") {
+		std::cout << binToHex(serialize(tokenize(input, Metadata(), false))) << "\n";
-        std::cout << assemble(parseLLL(input, true)) << "\n";
+	else if (command == "flatten")
-    }
+		std::cout << printTokens(flatten(parseLLL(input, true))) << "\n";
-    else if (command == "serialize") {
+	else if (command == "deserialize")
-        std::cout << binToHex(serialize(tokenize(input, Metadata(), false))) << "\n";
+		std::cout << printTokens(deserialize(hexToBin(input))) << "\n";
-    }
+	else if (command == "compile")
-    else if (command == "flatten") {
+		std::cout << binToHex(compile(input)) << "\n";
-        std::cout << printTokens(flatten(parseLLL(input, true))) << "\n";
+	else if (command == "encode_datalist")
-    }
+	{
-    else if (command == "deserialize") {
+		std::vector<Node> tokens = tokenize(input);
-        std::cout << printTokens(deserialize(hexToBin(input))) << "\n";
+		std::vector<std::string> o;
-    }
+		for (int i = 0; i < (int)tokens.size(); i++)
-    else if (command == "compile") {
+			o.push_back(tokens[i].val);
-        std::cout << binToHex(compile(input)) << "\n";
+		std::cout << binToHex(encodeDatalist(o)) << "\n";
-    }
+	}
-    else if (command == "encode_datalist") {
+	else if (command == "decode_datalist")
-        std::vector<Node> tokens = tokenize(input);
+	{
-        std::vector<std::string> o;
+		std::vector<std::string> o = decodeDatalist(hexToBin(input));
-        for (int i = 0; i < (int)tokens.size(); i++) {
+		std::vector<Node> tokens;
-            o.push_back(tokens[i].val);
+		for (int i = 0; i < (int)o.size(); i++)
-        }
+			tokens.push_back(token(o[i]));
-        std::cout << binToHex(encodeDatalist(o)) << "\n";
+		std::cout << printTokens(tokens) << "\n";
-    }
+	}
-    else if (command == "decode_datalist") {
+	else if (command == "tokenize")
-        std::vector<std::string> o = decodeDatalist(hexToBin(input));
+		std::cout << printTokens(tokenize(input));
-        std::vector<Node> tokens;
+	else if (command == "biject")
-        for (int i = 0; i < (int)o.size(); i++)
+	{
-            tokens.push_back(token(o[i]));
+		if (argv == 3)
-        std::cout << printTokens(tokens) << "\n";
+			std::cerr << "Not enough arguments for biject\n";
-    }
+		int pos = decimalToUnsigned(secondInput);
-    else if (command == "tokenize") {
+		std::vector<Node> n = prettyCompile(input);
-        std::cout << printTokens(tokenize(input));
+		if (pos >= (int)n.size())
-    }
+			std::cerr << "Code position too high\n";
-    else if (command == "biject") {
+		Metadata m = n[pos].metadata;
-        if (argv == 3)
+		std::cout << "Opcode: " << n[pos].val << ", file: " << m.file <<
-             std::cerr << "Not enough arguments for biject\n";
+					 ", line: " << m.ln << ", char: " << m.ch << "\n";
-        int pos = decimalToUnsigned(secondInput);
+	}
-        std::vector<Node> n = prettyCompile(input);
-        if (pos >= (int)n.size())
-             std::cerr << "Code position too high\n";
-        Metadata m = n[pos].metadata;
-        std::cout << "Opcode: " << n[pos].val << ", file: " << m.file << 
-             ", line: " << m.ln << ", char: " << m.ch << "\n";
-    }
 }

test/crypto.cpp

@@ -46,12 +46,14 @@ BOOST_AUTO_TEST_CASE(crypto_tests)
 		t.nonce = 0;
 		t.receiveAddress = h160(fromHex("944400f4b88ac9589a0f17ed4671da26bddb668b"));
 		t.value = 1000;
-		cnote << RLP(t.rlp(false));
+		auto rlp = t.rlp(false);
-		cnote << toHex(t.rlp(false));
+		cnote << RLP(rlp);
+		cnote << toHex(rlp);
 		cnote << t.sha3(false);
 		t.sign(p.secret());
-		cnote << RLP(t.rlp(true));
+		rlp = t.rlp(true);
-		cnote << toHex(t.rlp(true));
+		cnote << RLP(rlp);
+		cnote << toHex(rlp);
 		cnote << t.sha3(true);
 		BOOST_REQUIRE(t.sender() == p.address());
 	}
@@ -72,12 +74,14 @@ int cryptoTest()
 		t.nonce = 0;
 		t.receiveAddress = h160(fromHex("944400f4b88ac9589a0f17ed4671da26bddb668b"));
 		t.value = 1000;
-		cnote << RLP(t.rlp(false));
+		auto rlp = t.rlp(false);
-		cnote << toHex(t.rlp(false));
+		cnote << RLP(rlp);
+		cnote << toHex(rlp);
 		cnote << t.sha3(false);
 		t.sign(p.secret());
-		cnote << RLP(t.rlp(true));
+		rlp = t.rlp(true);
-		cnote << toHex(t.rlp(true));
+		cnote << RLP(rlp);
+		cnote << toHex(rlp);
 		cnote << t.sha3(true);
 		assert(t.sender() == p.address());
 	}

test/vm.cpp

@@ -14,367 +14,395 @@
 	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 state.cpp
+/** @file vm.cpp
  * @author Gav Wood <i@gavwood.com>
  * @date 2014
- * State test functions.
+ * vm test functions.
  */
 
-#include <fstream>
+#include "vm.h"
-#include <cstdint>
+
-#include <libdevcore/Log.h>
+#define FILL_TESTS
-#include <libevmface/Instruction.h>
-#include <libevm/ExtVMFace.h>
-#include <libevm/VM.h>
-#include <liblll/Compiler.h>
-#include <libethereum/Transaction.h>
-#include "JsonSpiritHeaders.h"
-#include <boost/test/unit_test.hpp>
 
 using namespace std;
 using namespace json_spirit;
 using namespace dev;
 using namespace dev::eth;
+using namespace dev::test;
 
-namespace dev { namespace test {
+FakeExtVM::FakeExtVM(eth::BlockInfo const& _previousBlock, eth::BlockInfo const& _currentBlock):
+	ExtVMFace(Address(), Address(), Address(), 0, 1, bytesConstRef(), bytesConstRef(), _previousBlock, _currentBlock) {}
 
-class FakeExtVM: public ExtVMFace
+h160 FakeExtVM::create(u256 _endowment, u256* _gas, bytesConstRef _init, OnOpFunc)
 {
-public:
+	Transaction t;
-	FakeExtVM()
+	t.value = _endowment;
-	{}
+	t.gasPrice = gasPrice;
-	FakeExtVM(BlockInfo const& _previousBlock, BlockInfo const& _currentBlock):
+	t.gas = *_gas;
-		ExtVMFace(Address(), Address(), Address(), 0, 1, bytesConstRef(), bytesConstRef(), _previousBlock, _currentBlock)
+	t.data = _init.toBytes();
-	{}
+	callcreates.push_back(t);
-
+
-	u256 store(u256 _n)
+	m_s.noteSending(myAddress);
-	{
+	m_ms.internal.resize(m_ms.internal.size() + 1);
-		return get<2>(addresses[myAddress])[_n];
+	auto ret = m_s.create(myAddress, _endowment, gasPrice, _gas, _init, origin, &suicides, &posts, &m_ms ? &(m_ms.internal.back()) : nullptr, OnOpFunc(), 1);
-	}
+	if (!m_ms.internal.back().from)
-	void setStore(u256 _n, u256 _v)
+		m_ms.internal.pop_back();
-	{
+
-		get<2>(addresses[myAddress])[_n] = _v;
+	if (get<0>(addresses[myAddress]) >= _endowment)
-	}
-	u256 balance(Address _a) { return get<0>(addresses[_a]); }
-	void subBalance(u256 _a) { get<0>(addresses[myAddress]) -= _a; }
-	u256 txCount(Address _a) { return get<1>(addresses[_a]); }
-	void suicide(Address _a)
 	{
-		get<0>(addresses[_a]) += get<0>(addresses[myAddress]);
+		get<1>(addresses[myAddress])++;
-		addresses.erase(myAddress);
+		get<0>(addresses[ret]) = _endowment;
-	}
+		get<3>(addresses[ret]) = m_s.code(ret);
-	h160 create(u256 _endowment, u256* _gas, bytesConstRef _init, OnOpFunc)
-	{
-		Address na = right160(sha3(rlpList(myAddress, get<1>(addresses[myAddress]))));
-/*		if (get<0>(addresses[myAddress]) >= _endowment)
-		{
-			get<1>(addresses[myAddress])++;
-			get<0>(addresses[na]) = _endowment;
-			// TODO: actually execute...
-		}*/
-		Transaction t;
-		t.value = _endowment;
-		t.gasPrice = gasPrice;
-		t.gas = *_gas;
-		t.data = _init.toBytes();
-		callcreates.push_back(t);
-		return na;
 	}
 
-	bool call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256* _gas, bytesRef _out, OnOpFunc, Address, Address)
+	return ret;
-	{
+}
-/*		if (get<0>(addresses[myAddress]) >= _value)
-		{
-			get<1>(addresses[myAddress])++;
-			get<0>(addresses[_receiveAddress]) += _value;
-			// TODO: actually execute...
-		}*/
-		Transaction t;
-		t.value = _value;
-		t.gasPrice = gasPrice;
-		t.gas = *_gas;
-		t.data = _data.toVector();
-		t.receiveAddress = _receiveAddress;
-		callcreates.push_back(t);
-		(void)_out;
-		return true;
-	}
 
-	void setTransaction(Address _caller, u256 _value, u256 _gasPrice, bytes const& _data)
+bool FakeExtVM::call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256* _gas, bytesRef _out, OnOpFunc, Address, Address)
-	{
+{
-		caller = origin = _caller;
+	Transaction t;
-		value = _value;
+	t.value = _value;
-		data = &(thisTxData = _data);
+	t.gasPrice = gasPrice;
-		gasPrice = _gasPrice;
+	t.gas = *_gas;
-	}
+	t.data = _data.toVector();
-	void setContract(Address _myAddress, u256 _myBalance, u256 _myNonce, map<u256, u256> const& _storage, bytes const& _code)
+	t.receiveAddress = _receiveAddress;
-	{
-		myAddress = _myAddress;
-		set(myAddress, _myBalance, _myNonce, _storage, _code);
-	}
-	void set(Address _a, u256 _myBalance, u256 _myNonce, map<u256, u256> const& _storage, bytes const& _code)
-	{
-		get<0>(addresses[_a]) = _myBalance;
-		get<1>(addresses[_a]) = _myNonce;
-		get<2>(addresses[_a]) = _storage;
-		get<3>(addresses[_a]) = _code;
-	}
 
-	void reset(u256 _myBalance, u256 _myNonce, map<u256, u256> const& _storage)
+	string codeOf_receiveAddress = toHex(get<3>(addresses[_receiveAddress]) );
-	{
+	string sizeOfCode = toHex(toCompactBigEndian((codeOf_receiveAddress.size()+1)/2));
-		callcreates.clear();
-		addresses.clear();
-		set(myAddress, _myBalance, _myNonce, _storage, get<3>(addresses[myAddress]));
-	}
 
-	static u256 toInt(mValue const& _v)
+	if (codeOf_receiveAddress.size())
 	{
-		switch (_v.type())
+		// create init code that returns given contract code
+		string initStringHex = "{ (CODECOPY 0 (- (CODESIZE) 0x" + sizeOfCode + "  ) 0x" + sizeOfCode + ") (RETURN 0 0x" + sizeOfCode +")}";
+		bytes initBytes = compileLLL(initStringHex, true, NULL);
+		initBytes += fromHex(codeOf_receiveAddress);
+		bytesConstRef init(&initBytes);
+
+		if (!m_s.addresses().count(_receiveAddress))
 		{
-		case str_type: return u256(_v.get_str());
+			m_s.noteSending(myAddress);
-		case int_type: return (u256)_v.get_uint64();
+			m_ms.internal.resize(m_ms.internal.size() + 1);
-		case bool_type: return (u256)(uint64_t)_v.get_bool();
+			auto na = m_s.create(myAddress, 0, gasPrice, _gas, init, origin, &suicides, &posts, &m_ms ? &(m_ms.internal.back()) : nullptr, OnOpFunc(), 1);
-		case real_type: return (u256)(uint64_t)_v.get_real();
+			if (!m_ms.internal.back().from)
-		default: cwarn << "Bad type for scalar: " << _v.type();
+				m_ms.internal.pop_back();
+			if (!m_s.addresses().count(_receiveAddress))
+			{
+				cnote << "not able to call to : " << _receiveAddress << "\n";
+				cnote << "in FakeExtVM you can only make a call to " << na << "\n";
+				BOOST_THROW_EXCEPTION(FakeExtVMFailure() << errinfo_comment("Address not callable in FakeExtVM\n") << errinfo_wrongAddress(_receiveAddress));
+				return false;
+			}
 		}
-		return 0;
-	}
 
-	static byte toByte(mValue const& _v)
+		m_ms.internal.resize(m_ms.internal.size() + 1);
-	{
+		auto ret = m_s.call(_receiveAddress, Address() ? Address() : _receiveAddress, Address() ? Address() : myAddress, _value, gasPrice, _data, _gas, _out, origin, &suicides, &posts,  &(m_ms.internal.back()), OnOpFunc(), 1);
-		switch (_v.type())
+		if (!m_ms.internal.back().from)
+			m_ms.internal.pop_back();
+		if (!ret)
+			return false;
+
+		if (get<0>(addresses[myAddress]) >= _value)
 		{
-		case str_type: return (byte)stoi(_v.get_str());
+			get<1>(addresses[myAddress])++;
-		case int_type: return (byte)_v.get_uint64();
+			get<0>(addresses[_receiveAddress]) += _value;
-		case bool_type: return (byte)_v.get_bool();
+
-		case real_type: return (byte)_v.get_real();
+			for (auto const& j: m_s.storage(_receiveAddress))
-		default: cwarn << "Bad type for scalar: " << _v.type();
+			{
+				u256 adr(j.first);
+				if ((j.second != 0) )
+					get<2>(addresses[_receiveAddress])[adr] = j.second;
+			}
 		}
-		return 0;
-	}
 
-	static void push(mObject& o, string const& _n, u256 _v)
-	{
-//		if (_v < (u256)1 << 64)
-//			o[_n] = (uint64_t)_v;
-//		else
-			o[_n] = toString(_v);
 	}
+	else
+		addresses.erase(_receiveAddress); // for the sake of comparison
 
-	static void push(mArray& a, u256 _v)
+	callcreates.push_back(t);
-	{
+
-//		if (_v < (u256)1 << 64)
+	return true;
-//			a.push_back((uint64_t)_v);
+}
-//		else
+
-			a.push_back(toString(_v));
+void FakeExtVM::setTransaction(Address _caller, u256 _value, u256 _gasPrice, bytes const& _data)
-	}
+{
+	caller = origin = _caller;
+	value = _value;
+	data = &(thisTxData = _data);
+	gasPrice = _gasPrice;
+}
+
+void FakeExtVM::setContract(Address _myAddress, u256 _myBalance, u256 _myNonce, map<u256, u256> const& _storage, bytes const& _code)
+{
+	myAddress = _myAddress;
+	set(myAddress, _myBalance, _myNonce, _storage, _code);
+}
+
+void FakeExtVM::set(Address _a, u256 _myBalance, u256 _myNonce, map<u256, u256> const& _storage, bytes const& _code)
+{
+	get<0>(addresses[_a]) = _myBalance;
+	get<1>(addresses[_a]) = _myNonce;
+	get<2>(addresses[_a]) = _storage;
+	get<3>(addresses[_a]) = _code;
+}
+
+void FakeExtVM::reset(u256 _myBalance, u256 _myNonce, map<u256, u256> const& _storage)
+{
+	callcreates.clear();
+	addresses.clear();
+	set(myAddress, _myBalance, _myNonce, _storage, get<3>(addresses[myAddress]));
+}
 
-	mObject exportEnv()
+u256 FakeExtVM::toInt(mValue const& _v)
+{
+	switch (_v.type())
 	{
-		mObject ret;
+	case str_type: return u256(_v.get_str());
-		ret["previousHash"] = toString(previousBlock.hash);
+	case int_type: return (u256)_v.get_uint64();
-		push(ret, "currentDifficulty", currentBlock.difficulty);
+	case bool_type: return (u256)(uint64_t)_v.get_bool();
-		push(ret, "currentTimestamp", currentBlock.timestamp);
+	case real_type: return (u256)(uint64_t)_v.get_real();
-		ret["currentCoinbase"] = toString(currentBlock.coinbaseAddress);
+	default: cwarn << "Bad type for scalar: " << _v.type();
-		push(ret, "currentNumber", currentBlock.number);
-		push(ret, "currentGasLimit", currentBlock.gasLimit);
-		return ret;
 	}
+	return 0;
+}
 
-	void importEnv(mObject& _o)
+byte FakeExtVM::toByte(mValue const& _v)
+{
+	switch (_v.type())
 	{
-		BOOST_REQUIRE(_o.count("previousHash") > 0);
+	case str_type: return (byte)stoi(_v.get_str());
-		BOOST_REQUIRE(_o.count("currentGasLimit") > 0);
+	case int_type: return (byte)_v.get_uint64();
-		BOOST_REQUIRE(_o.count("currentDifficulty") > 0);
+	case bool_type: return (byte)_v.get_bool();
-		BOOST_REQUIRE(_o.count("currentTimestamp") > 0);
+	case real_type: return (byte)_v.get_real();
-		BOOST_REQUIRE(_o.count("currentCoinbase") > 0);
+	default: cwarn << "Bad type for scalar: " << _v.type();
-		BOOST_REQUIRE(_o.count("currentNumber") > 0);
-
-		previousBlock.hash = h256(_o["previousHash"].get_str());
-		currentBlock.number = toInt(_o["currentNumber"]);
-		currentBlock.gasLimit = toInt(_o["currentGasLimit"]);
-		currentBlock.difficulty = toInt(_o["currentDifficulty"]);
-		currentBlock.timestamp = toInt(_o["currentTimestamp"]);
-		currentBlock.coinbaseAddress = Address(_o["currentCoinbase"].get_str());
 	}
+	return 0;
+}
+
+void FakeExtVM::push(mObject& o, string const& _n, u256 _v)
+{
+	//		if (_v < (u256)1 << 64)
+	//			o[_n] = (uint64_t)_v;
+	//		else
+	o[_n] = toString(_v);
+}
 
-	mObject exportState()
+void FakeExtVM::push(mArray& a, u256 _v)
+{
+	//		if (_v < (u256)1 << 64)
+	//			a.push_back((uint64_t)_v);
+	//		else
+	a.push_back(toString(_v));
+}
+
+mObject FakeExtVM::exportEnv()
+{
+	mObject ret;
+	ret["previousHash"] = toString(previousBlock.hash);
+	push(ret, "currentDifficulty", currentBlock.difficulty);
+	push(ret, "currentTimestamp", currentBlock.timestamp);
+	ret["currentCoinbase"] = toString(currentBlock.coinbaseAddress);
+	push(ret, "currentNumber", currentBlock.number);
+	push(ret, "currentGasLimit", currentBlock.gasLimit);
+	return ret;
+}
+
+void FakeExtVM::importEnv(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);
+
+	previousBlock.hash = h256(_o["previousHash"].get_str());
+	currentBlock.number = toInt(_o["currentNumber"]);
+	currentBlock.gasLimit = toInt(_o["currentGasLimit"]);
+	currentBlock.difficulty = toInt(_o["currentDifficulty"]);
+	currentBlock.timestamp = toInt(_o["currentTimestamp"]);
+	currentBlock.coinbaseAddress = Address(_o["currentCoinbase"].get_str());
+}
+
+mObject FakeExtVM::exportState()
+{
+	mObject ret;
+	for (auto const& a: addresses)
 	{
-		mObject ret;
+		mObject o;
-		for (auto const& a: addresses)
+		push(o, "balance", get<0>(a.second));
-		{
+		push(o, "nonce", get<1>(a.second));
-			mObject o;
-			push(o, "balance", get<0>(a.second));
-			push(o, "nonce", get<1>(a.second));
 
+		{
+			mObject store;
+			string curKey;
+			u256 li = 0;
+			bool isOutOfRange = false;
+			mArray curVal;
+			for (auto const& s: get<2>(a.second))
 			{
-				mObject store;
+				if (!li || s.first > li + 8)
-				string curKey;
-				u256 li = 0;
-				mArray curVal;
-				for (auto const& s: get<2>(a.second))
 				{
-					if (!li || s.first > li + 8)
+					if (li || isOutOfRange)
-					{
+						store[curKey] = curVal;
-						if (li)
+					li = s.first;
-							store[curKey] = curVal;
+					curKey = "0x"+toHex(toCompactBigEndian(li));
-						li = s.first;
+					curVal = mArray();
-						curKey = "0x"+toHex(toCompactBigEndian(li));
-						curVal = mArray();
-					}
-					else
-						for (; li != s.first; ++li)
-							curVal.push_back(0);
-					curVal.push_back("0x"+toHex(toCompactBigEndian(s.second)));
-					++li;
 				}
-				if (li)
+				else
-					store[curKey] = curVal;
+					for (; li != s.first; ++li)
-				o["storage"] = store;
+						curVal.push_back(0);
+				curVal.push_back("0x"+toHex(toCompactBigEndian(s.second)));
+				if ( toHex(toCompactBigEndian(li)) == "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")
+					isOutOfRange = true;
+				++li;
 			}
-			o["code"] = "0x" + toHex(get<3>(a.second));
+			if (li || isOutOfRange)
-
+				store[curKey] = curVal;
-			ret[toString(a.first)] = o;
+			o["storage"] = store;
 		}
-		return ret;
+		o["code"] = "0x" + toHex(get<3>(a.second));
+
+		ret[toString(a.first)] = o;
 	}
+	return ret;
+}
 
-	void importState(mObject& _object)
+void FakeExtVM::importState(mObject& _object)
+{
+	for (auto const& i: _object)
 	{
-		for (auto const& i: _object)
+		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);
+
+		auto& a = addresses[Address(i.first)];
+		get<0>(a) = toInt(o["balance"]);
+		get<1>(a) = toInt(o["nonce"]);
+		for (auto const& j: o["storage"].get_obj())
 		{
-			mObject o = i.second.get_obj();
+			u256 adr(j.first);
-			BOOST_REQUIRE(o.count("balance") > 0);
+			for (auto const& k: j.second.get_array())
-			BOOST_REQUIRE(o.count("nonce") > 0);
-			BOOST_REQUIRE(o.count("storage") > 0);
-			BOOST_REQUIRE(o.count("code") > 0);
-
-			auto& a = addresses[Address(i.first)];
-			get<0>(a) = toInt(o["balance"]);
-			get<1>(a) = toInt(o["nonce"]);
-			for (auto const& j: o["storage"].get_obj())
 			{
-				u256 adr(j.first);
+				if ((toInt(k) != 0) || (j.second.get_array().size() == 1))
-				for (auto const& k: j.second.get_array())
+					get<2>(a)[adr] = toInt(k);
-					get<2>(a)[adr++] = toInt(k);
+				adr++;
 			}
+		}
 
-			if (o["code"].type() == str_type)
+		if (o["code"].type() == str_type)
-				if (o["code"].get_str().find_first_of("0x") != 0)
+			if (o["code"].get_str().find_first_of("0x") != 0)
-					get<3>(a) = compileLLL(o["code"].get_str(), false);
+				get<3>(a) = compileLLL(o["code"].get_str(), false);
-				else
-					get<3>(a) = fromHex(o["code"].get_str().substr(2));
 			else
-			{
+				get<3>(a) = fromHex(o["code"].get_str().substr(2));
-				get<3>(a).clear();
+		else
-				for (auto const& j: o["code"].get_array())
+		{
-					get<3>(a).push_back(toByte(j));
+			get<3>(a).clear();
-			}
+			for (auto const& j: o["code"].get_array())
+				get<3>(a).push_back(toByte(j));
 		}
 	}
+}
 
-	mObject exportExec()
+mObject FakeExtVM::exportExec()
-	{
+{
-		mObject ret;
+	mObject ret;
-		ret["address"] = toString(myAddress);
+	ret["address"] = toString(myAddress);
-		ret["caller"] = toString(caller);
+	ret["caller"] = toString(caller);
-		ret["origin"] = toString(origin);
+	ret["origin"] = toString(origin);
-		push(ret, "value", value);
+	push(ret, "value", value);
-		push(ret, "gasPrice", gasPrice);
+	push(ret, "gasPrice", gasPrice);
-		push(ret, "gas", gas);
+	push(ret, "gas", gas);
-		ret["data"] = "0x" + toHex(data);
+	ret["data"] = "0x" + toHex(data);
-		ret["code"] = "0x" + toHex(code);
+	ret["code"] = "0x" + toHex(code);
-		return ret;
+	return ret;
-	}
+}
 
-	void importExec(mObject& _o)
+void FakeExtVM::importExec(mObject& _o)
-	{
+{
-		BOOST_REQUIRE(_o.count("address")> 0); 
+	BOOST_REQUIRE(_o.count("address")> 0);
-		BOOST_REQUIRE(_o.count("caller") > 0);
+	BOOST_REQUIRE(_o.count("caller") > 0);
-		BOOST_REQUIRE(_o.count("origin") > 0); 
+	BOOST_REQUIRE(_o.count("origin") > 0);
-		BOOST_REQUIRE(_o.count("value") > 0); 
+	BOOST_REQUIRE(_o.count("value") > 0);
-		BOOST_REQUIRE(_o.count("data") > 0);
+	BOOST_REQUIRE(_o.count("data") > 0);
-		BOOST_REQUIRE(_o.count("gasPrice") > 0);
+	BOOST_REQUIRE(_o.count("gasPrice") > 0);
-		BOOST_REQUIRE(_o.count("gas") > 0);
+	BOOST_REQUIRE(_o.count("gas") > 0);
-
+
-		myAddress = Address(_o["address"].get_str());
+	myAddress = Address(_o["address"].get_str());
-		caller = Address(_o["caller"].get_str());
+	caller = Address(_o["caller"].get_str());
-		origin = Address(_o["origin"].get_str());
+	origin = Address(_o["origin"].get_str());
-		value = toInt(_o["value"]);
+	value = toInt(_o["value"]);
-		gasPrice = toInt(_o["gasPrice"]);
+	gasPrice = toInt(_o["gasPrice"]);
-		gas = toInt(_o["gas"]);
+	gas = toInt(_o["gas"]);
-
+
-		thisTxCode.clear();
+	thisTxCode.clear();
-		code = &thisTxCode;
+	code = &thisTxCode;
-		if (_o["code"].type() == str_type)
+	if (_o["code"].type() == str_type)
-			if (_o["code"].get_str().find_first_of("0x") == 0)
+		if (_o["code"].get_str().find_first_of("0x") == 0)
-				thisTxCode = compileLLL(_o["code"].get_str());
+			thisTxCode = compileLLL(_o["code"].get_str());
-			else
-				thisTxCode = fromHex(_o["code"].get_str().substr(2));
-		else if (_o["code"].type() == array_type)
-			for (auto const& j: _o["code"].get_array())
-				thisTxCode.push_back(toByte(j));
 		else
-			code.reset();
+			thisTxCode = fromHex(_o["code"].get_str().substr(2));
-
+	else if (_o["code"].type() == array_type)
-		thisTxData.clear();
+		for (auto const& j: _o["code"].get_array())
-		if (_o["data"].type() == str_type)
+			thisTxCode.push_back(toByte(j));
-			if (_o["data"].get_str().find_first_of("0x") == 0)
+	else
-				thisTxData = fromHex(_o["data"].get_str().substr(2));
+		code.reset();
-			else
+
-				thisTxData = fromHex(_o["data"].get_str());
+	thisTxData.clear();
+	if (_o["data"].type() == str_type)
+		if (_o["data"].get_str().find_first_of("0x") == 0)
+			thisTxData = fromHex(_o["data"].get_str().substr(2));
 		else
-			for (auto const& j: _o["data"].get_array())
+			thisTxData = fromHex(_o["data"].get_str());
-				thisTxData.push_back(toByte(j));
+	else
-		data = &thisTxData;
+		for (auto const& j: _o["data"].get_array())
-	}
+			thisTxData.push_back(toByte(j));
+	data = &thisTxData;
+}
 
-	mArray exportCallCreates()
+mArray FakeExtVM::exportCallCreates()
+{
+	mArray ret;
+	for (Transaction const& tx: callcreates)
 	{
-		mArray ret;
+		mObject o;
-		for (Transaction const& tx: callcreates)
+		o["destination"] = toString(tx.receiveAddress);
-		{
+		push(o, "gasLimit", tx.gas);
-			mObject o;
+		push(o, "value", tx.value);
-			o["destination"] = toString(tx.receiveAddress);
+		o["data"] = "0x" + toHex(tx.data);
-			push(o, "gasLimit", tx.gas);
+		ret.push_back(o);
-			push(o, "value", tx.value);
-			o["data"] = "0x" + toHex(tx.data);
-			ret.push_back(o);
-		}
-		return ret;
 	}
+	return ret;
+}
 
-	void importCallCreates(mArray& _callcreates)
+void FakeExtVM::importCallCreates(mArray& _callcreates)
+{
+	for (mValue& v: _callcreates)
 	{
-		for (mValue& v: _callcreates)
+		auto tx = v.get_obj();
-		{
+		BOOST_REQUIRE(tx.count("data") > 0);
-			auto tx = v.get_obj();
+		BOOST_REQUIRE(tx.count("value") > 0);
-			BOOST_REQUIRE(tx.count("data") > 0);
+		BOOST_REQUIRE(tx.count("destination") > 0);
-			BOOST_REQUIRE(tx.count("value") > 0);
+		BOOST_REQUIRE(tx.count("gasLimit") > 0);
-			BOOST_REQUIRE(tx.count("destination") > 0);
+		Transaction t;
-			BOOST_REQUIRE(tx.count("gasLimit") > 0);
+		t.receiveAddress = Address(tx["destination"].get_str());
-			Transaction t;
+		t.value = toInt(tx["value"]);
-			t.receiveAddress = Address(tx["destination"].get_str());
+		t.gas = toInt(tx["gasLimit"]);
-			t.value = toInt(tx["value"]);
+		if (tx["data"].type() == str_type)
-			t.gas = toInt(tx["gasLimit"]);
+			if (tx["data"].get_str().find_first_of("0x") == 0)
-			if (tx["data"].type() == str_type)
+				t.data = fromHex(tx["data"].get_str().substr(2));
-				if (tx["data"].get_str().find_first_of("0x") == 0)
-					t.data = fromHex(tx["data"].get_str().substr(2));
-				else
-					t.data = fromHex(tx["data"].get_str());
 			else
-				for (auto const& j: tx["data"].get_array())
+				t.data = fromHex(tx["data"].get_str());
-					t.data.push_back(toByte(j));
+		else
-			callcreates.push_back(t);
+			for (auto const& j: tx["data"].get_array())
-		}
+				t.data.push_back(toByte(j));
+		callcreates.push_back(t);
 	}
+}
+
 
-	map<Address, tuple<u256, u256, map<u256, u256>, bytes>> addresses;
+namespace dev { namespace test {
-	Transactions callcreates;
-	bytes thisTxData;
-	bytes thisTxCode;
-	u256 gas;
-};
 
 void doTests(json_spirit::mValue& v, bool _fillin)
 {
@@ -401,8 +429,40 @@ void doTests(json_spirit::mValue& v, bool _fillin)
 			fev.thisTxCode = get<3>(fev.addresses.at(fev.myAddress));
 			fev.code = &fev.thisTxCode;
 		}
+
 		vm.reset(fev.gas);
-		bytes output = vm.go(fev).toBytes();
+		bytes output;
+		try
+		{
+			output = vm.go(fev).toBytes();
+		}
+		catch (Exception const& _e)
+		{
+			cnote << "VM did throw an exception: " << diagnostic_information(_e);
+			//BOOST_ERROR("Failed VM Test with Exception: " << e.what());
+		}
+		catch (std::exception const& _e)
+		{
+			cnote << "VM did throw an exception: " << _e.what();
+			//BOOST_ERROR("Failed VM Test with Exception: " << e.what());
+		}
+
+		// delete null entries in storage for the sake of comparison
+
+		for (auto  &a: fev.addresses)
+		{
+			vector<u256> keystoDelete;
+			for (auto &s: get<2>(a.second))
+			{
+				if (s.second == 0)
+					keystoDelete.push_back(s.first);
+			}
+			for (auto const key: keystoDelete )
+			{
+				get<2>(a.second).erase(key);
+			}
+		}
+
 
 		if (_fillin)
 		{
@@ -427,7 +487,7 @@ void doTests(json_spirit::mValue& v, bool _fillin)
 			if (o["out"].type() == array_type)
 				for (auto const& d: o["out"].get_array())
 				{
-					BOOST_CHECK_MESSAGE(output[i] == FakeExtVM::toInt(d), "Output byte [" << i << "] different!");
+					BOOST_CHECK_MESSAGE(output[i] == test.toInt(d), "Output byte [" << i << "] different!");
 					++i;
 				}
 			else if (o["out"].get_str().find("0x") == 0)
@@ -435,7 +495,7 @@ void doTests(json_spirit::mValue& v, bool _fillin)
 			else
 				BOOST_CHECK(output == fromHex(o["out"].get_str()));
 
-			BOOST_CHECK(FakeExtVM::toInt(o["gas"]) == vm.gas());
+			BOOST_CHECK(test.toInt(o["gas"]) == vm.gas());
 			BOOST_CHECK(test.addresses == fev.addresses);
 			BOOST_CHECK(test.callcreates == fev.callcreates);
 		}
@@ -470,65 +530,92 @@ void doTests(json_spirit::mValue& v, bool _fillin)
 	return json_spirit::write_string(json_spirit::mValue(o), true);
 }*/
 
-} } // Namespace Close
+void executeTests(const string& _name)
-
-BOOST_AUTO_TEST_CASE(vm_tests)
 {
-	/*
+#ifdef FILL_TESTS
-	// Populate tests first:
 	try
 	{
 		cnote << "Populating VM tests...";
 		json_spirit::mValue v;
-		string s = asString(contents("../../../cpp-ethereum/test/vmtests.json"));
+		string s = asString(contents("../../../cpp-ethereum/test/" + _name + "Filler.json"));
-		BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'vmtests.json' is empty.");
+		BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + _name + "Filler.json is empty.");
 		json_spirit::read_string(s, v);
 		dev::test::doTests(v, true);
-		writeFile("../../../tests/vmtests.json", asBytes(json_spirit::write_string(v, true)));
+		writeFile("../../../tests/" + _name + ".json", asBytes(json_spirit::write_string(v, true)));
 	}
-	catch (std::exception const& e)
+	catch (Exception const& _e)
 	{
-		BOOST_ERROR("Failed VM Test with Exception: " << e.what());
+		BOOST_ERROR("Failed VM Test with Exception: " << diagnostic_information(_e));
-	}*/
+	}
+	catch (std::exception const& _e)
+	{
+		BOOST_ERROR("Failed VM Test with Exception: " << _e.what());
+	}
+#endif
 
 	try
 	{
-		cnote << "Testing VM...";
+		cnote << "Testing VM..." << _name;
 		json_spirit::mValue v;
-		string s = asString(contents("../../../tests/vmtests.json"));
+		string s = asString(contents("../../../tests/" + _name + ".json"));
-		BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'vmtests.json' is empty. Have you cloned the 'tests' repo branch develop?");
+		BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + _name + ".json is empty. Have you cloned the 'tests' repo branch develop?");
 		json_spirit::read_string(s, v);
 		dev::test::doTests(v, false);
 	}
-	catch (std::exception const& e)
+	catch (Exception const& _e)
 	{
-		BOOST_ERROR("Failed VM Test with Exception: " << e.what()); 
+		BOOST_ERROR("Failed VM Test with Exception: " << diagnostic_information(_e));
 	}
+	catch (std::exception const& _e)
+	{
+		BOOST_ERROR("Failed VM Test with Exception: " << _e.what());
+	}
+
+}
+
+} } // Namespace Close
+
+BOOST_AUTO_TEST_CASE(vm_tests)
+{
+	dev::test::executeTests("vmtests");
 }
 
 BOOST_AUTO_TEST_CASE(vmArithmeticTest)
 {
-	/*
+	dev::test::executeTests("vmArithmeticTest");
-			cnote << "Populating VM tests...";
+}
-			json_spirit::mValue v;
-			string s = asString(contents("../../../cpp-ethereum/test/vmArithmeticTestFiller.json"));
-			BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'vmtests.json' is empty.");
-			json_spirit::read_string(s, v);
-			dev::test::doTests(v, true);
-			writeFile("../../../tests/vmArithmeticTest.json", asBytes(json_spirit::write_string(v, true)));
-	*/
 
-	try
+BOOST_AUTO_TEST_CASE(vmBitwiseLogicOperationTest)
-	{
+{
-		cnote << "Testing VM arithmetic commands...";
+	dev::test::executeTests("vmBitwiseLogicOperationTest");
-		json_spirit::mValue v;
+}
-		string s = asString(contents("../../../tests/vmArithmeticTest.json"));
+
-		BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'vmArithmeticTest.json' is empty. Have you cloned the 'tests' repo branch develop?");
+BOOST_AUTO_TEST_CASE(vmSha3Test)
-		json_spirit::read_string(s, v);
+{
-		dev::test::doTests(v, false);
+	dev::test::executeTests("vmSha3Test");
-	}
+}
-	catch (std::exception const& e)
+
-	{
+BOOST_AUTO_TEST_CASE(vmEnvironmentalInfoTest)
-		BOOST_ERROR("Failed VM arithmetic test with Exception: " << e.what());
+{
-	}
+	dev::test::executeTests("vmEnvironmentalInfoTest");
+}
+
+BOOST_AUTO_TEST_CASE(vmBlockInfoTest)
+{
+	dev::test::executeTests("vmBlockInfoTest");
+}
+
+BOOST_AUTO_TEST_CASE(vmIOandFlowOperationsTest)
+{
+	dev::test::executeTests("vmIOandFlowOperationsTest");
+}
+
+BOOST_AUTO_TEST_CASE(vmPushDupSwapTest)
+{
+	dev::test::executeTests("vmPushDupSwapTest");
+}
+
+BOOST_AUTO_TEST_CASE(vmSystemOperationsTest)
+{
+	dev::test::executeTests("vmSystemOperationsTest");
 }

test/vm.h

@@ -0,0 +1,86 @@
+/*
+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 vm.h
+ * @author Christoph Jentzsch <jentzsch.simulationsoftware@gmail.com>
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2014
+ * vm test functions.
+ */
+
+#pragma once
+
+#include <fstream>
+#include <cstdint>
+#include <boost/test/unit_test.hpp>
+#include "JsonSpiritHeaders.h"
+#include <libdevcore/Log.h>
+#include <libevmface/Instruction.h>
+#include <libevm/ExtVMFace.h>
+#include <libevm/VM.h>
+#include <liblll/Compiler.h>
+#include <libethereum/Transaction.h>
+#include <libethereum/ExtVM.h>
+#include <libethereum/State.h>
+
+namespace dev { namespace test {
+
+struct FakeExtVMFailure : virtual Exception {};
+
+class FakeExtVM: public eth::ExtVMFace
+{
+public:
+	FakeExtVM()	{}
+	FakeExtVM(eth::BlockInfo const& _previousBlock, eth::BlockInfo const& _currentBlock);
+
+	u256 store(u256 _n) { return std::get<2>(addresses[myAddress])[_n]; }
+	void setStore(u256 _n, u256 _v) { std::get<2>(addresses[myAddress])[_n] = _v; }
+	u256 balance(Address _a) { return std::get<0>(addresses[_a]); }
+	void subBalance(u256 _a) { std::get<0>(addresses[myAddress]) -= _a; }
+	u256 txCount(Address _a) { return std::get<1>(addresses[_a]); }
+	void suicide(Address _a) { std::get<0>(addresses[_a]) += std::get<0>(addresses[myAddress]); addresses.erase(myAddress); }
+	bytes const& codeAt(Address _a) { return std::get<3>(addresses[_a]); }
+	h160 create(u256 _endowment, u256* _gas, bytesConstRef _init, eth::OnOpFunc);
+	bool call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256* _gas, bytesRef _out, eth::OnOpFunc, Address, Address);
+	void setTransaction(Address _caller, u256 _value, u256 _gasPrice, bytes const& _data);
+	void setContract(Address _myAddress, u256 _myBalance, u256 _myNonce, std::map<u256, u256> const& _storage, bytes const& _code);
+	void set(Address _a, u256 _myBalance, u256 _myNonce, std::map<u256, u256> const& _storage, bytes const& _code);
+	void reset(u256 _myBalance, u256 _myNonce, std::map<u256, u256> const& _storage);
+	u256 toInt(json_spirit::mValue const& _v);
+	byte toByte(json_spirit::mValue const& _v);
+	void push(json_spirit::mObject& o, std::string const& _n, u256 _v);
+	void push(json_spirit::mArray& a, u256 _v);
+	json_spirit::mObject exportEnv();
+	void importEnv(json_spirit::mObject& _o);
+	json_spirit::mObject exportState();
+	void importState(json_spirit::mObject& _object);
+	json_spirit::mObject exportExec();
+	void importExec(json_spirit::mObject& _o);
+	json_spirit::mArray exportCallCreates();
+	void importCallCreates(json_spirit::mArray& _callcreates);
+
+	std::map<Address, std::tuple<u256, u256, std::map<u256, u256>, bytes>> addresses;
+	eth::Transactions callcreates;
+	bytes thisTxData;
+	bytes thisTxCode;
+	u256 gas;
+
+private:
+	eth::State m_s;
+	eth::Manifest m_ms;
+};
+
+} } // Namespace Close

test/vmBlockInfoTestFiller.json

@@ -0,0 +1,169 @@
+{
+    "prevhash": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ [[ 0 ]] (PREVHASH) }",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "coinbase": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ [[ 0 ]] (COINBASE) }",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "timestamp": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ [[ 0 ]] (TIMESTAMP) }",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "number": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ [[ 0 ]] (NUMBER) }",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "difficulty": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ [[ 0 ]] (DIFFICULTY) }",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "gaslimit": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ [[ 0 ]] (GASLIMIT) }",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    }
+}

test/vmEnvironmentalInfoTestFiller.json

@@ -0,0 +1,723 @@
+{
+    "address0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (ADDRESS)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "address1": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (ADDRESS)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "balance0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (BALANCE 0xcd1722f3947def4cf144679da39c4c32bdc35681 )}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "balance1": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (BALANCE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 )}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "balanceAddress2": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (EQ (BALANCE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) (BALANCE (ADDRESS)))}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+
+    "balanceCaller3": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (EQ (BALANCE 0xcd1722f3947def4cf144679da39c4c32bdc35681) (BALANCE (CALLER)))}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "origin": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (ORIGIN)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "caller": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (CALLER)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+
+    "callvalue": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (CALLVALUE)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+
+    "calldataload0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (CALLDATALOAD 0)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x256",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "calldataload1": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (CALLDATALOAD 1)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "calldataload2": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (CALLDATALOAD 5)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x123456789abcdef0000000000000000000000000000000000000000000000000024",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+
+    "calldatasize0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (CALLDATASIZE)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x256",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "calldatasize1": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (CALLDATASIZE)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "calldatasize2": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (CALLDATASIZE)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x230000000000000000000000000000000000000000000000000000000000000023",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "calldatacopy0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (CALLDATACOPY 0 1 2 ) [[ 0 ]] @0}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "calldatacopy1": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (CALLDATACOPY 0 1 1 ) [[ 0 ]] @0}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "calldatacopy2": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (CALLDATACOPY 0 1 0 ) [[ 0 ]] @0}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "codesize": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (CODESIZE)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "codecopy0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (CODECOPY 0 0 5 ) [[ 0 ]] @0 }",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "codecopy1": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (CODECOPY 0 0 (CODESIZE) ) [[ 0 ]] @0 }",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "gasprice": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (GASPRICE) }",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "123456789",
+            "gas" : "100000000000"
+        }
+    },
+
+    "extcodesize0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (EQ (EXTCODESIZE (CALLER)) (CODESIZE) ) }",
+                "storage": {}
+            },
+            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
+                "balance" : "1000000000000000000",
+                "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",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (CODESIZE)  }",
+                "storage": {}
+            },
+            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (EXTCODESIZE (CALLER) ) }",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "123456789",
+            "gas" : "100000000000"
+        }
+    },
+
+    "extcodecopy0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (EXTCODECOPY (CALLER) 0 0 (EXTCODESIZE (CALLER) ) ) [[ 0 ]] @0   }",
+                "storage": {}
+            },
+            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] 5 }",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0x1234567890abcdef01234567890abcdef",
+            "gasPrice" : "123456789",
+            "gas" : "100000000000"
+        }
+    }
+
+}

test/vmIOandFlowOperationsTestFiller.json

@@ -0,0 +1,813 @@
+{
+    "pop0": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "0x6002600360045057",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "pop1": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "0x5060026003600457",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "dupAt51doesNotExistAnymore": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "0x600260035157",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "swapAt52doesNotExistAnymore": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "0x600260035257",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "mstore_mload0": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{(MSTORE 0 23) [[ 1 ]] (MLOAD 0) } ",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "mloadError0": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{[[ 0 ]] (MLOAD 0) } ",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "mloadError1": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{(MSTORE 1 23) [[ 1 ]] (MLOAD 0) } ",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "mloadOutOfGasError2": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ [[ 1 ]] (MLOAD 7489573) } ",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "mstore0": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ (MSTORE 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 1 ]] (MLOAD 1) } ",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "mstore1": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ (MSTORE 1 (+ 2 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) ) [[ 1 ]] (MLOAD 1) } ",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "mstoreWordToBigError": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ (MSTORE 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23 ) [[ 1 ]] (MLOAD 1) } ",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "mstore8WordToBigError": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ (MSTORE8 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23 ) [[ 1 ]] (MLOAD 1) } ",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "mstore8_0": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ (MSTORE8 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ) [[ 1 ]] (MLOAD 1) } ",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "mstore8_1": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ (MSTORE8 1 0xff) (MSTORE8 2 0xee) [[ 1 ]] (MLOAD 0) } ",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "sstore_load_0": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ (SSTORE 0 0xff) (SSTORE 10 0xee)  [[ 20 ]] (SLOAD 0)  } ",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "sstore_load_1": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ (SSTORE 0 0xff) (SSTORE 10 0xee)  [[ 20 ]] (SLOAD 100)  } ",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "sstore_load_2": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ (SSTORE 0 0xff) (SSTORE 1 0xee) (SSTORE 2 0xdd) [[ 10 ]] (SLOAD 1) [[ 20 ]] (SLOAD 2)  } ",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "jump0_foreverOutOfGas": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "0x6023600058",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "jump0": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "0x60236007586001600257",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "jumpi0": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "0x602360016009596001600257",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "jumpi1": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "0x602360006009596001600257",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "pc0": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{ [[ 0 ]] (PC)}",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "pc1": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{(SSTORE 0 0xff) [[ 0 ]] (PC)}",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "msize0": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{(MSTORE 0 0xff) [[ 0 ]] (MSIZE)}",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "msize1": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{(MSTORE 0 0xffffffffff) [[ 0 ]] (MSIZE)}",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "msize2": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{(MSTORE 0 0xffffffffff)  (MSTORE 32 0xeeee) [[ 0 ]] (MSIZE)}",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "msize3": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{(MSTORE 0 0xffffffffff)  (MSTORE 90 0xeeee) [[ 0 ]] (MSIZE)}",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "gas0": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{(MSTORE 0 0xffffffffff)  (MSTORE 90 0xeeee) [[ 0 ]] (GAS)}",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "gas1": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "{[[ 0 ]] (GAS)}",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    }
+}

test/vmSha3TestFiller.json

@@ -0,0 +1,144 @@
+{
+    "sha3_0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (SHA3 0 0)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "1000000000",
+            "gas" : "100000000000"
+        }
+    },
+
+    "sha3_1": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (SHA3 4 5)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "sha3_2": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (SHA3 10 10)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "sha3_3": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (SHA3 1000 0xfffff)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "sha3_3": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ [[ 0 ]] (SHA3  0xfffffffff 100)}",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    }
+
+
+
+}

test/vmSystemOperationsTestFiller.json

@@ -0,0 +1,814 @@
+{
+    "createNameRegistrator": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0x601080600c6000396000f200600035560f6009590060203560003557) [[ 0 ]] (CREATE 23 4 28) }",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "createNameRegistratorValueTooHigh": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "100",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0x601080600c6000396000f200600035560f6009590060203560003557) [[ 0 ]] (CREATE 230 4 28) }",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "createNameRegistratorOutOfMemoryBonds0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "100",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0x601080600c6000396000f200600035560f6009590060203560003557) [[ 0 ]] (CREATE 23 0xfffffffffff 28) }",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "createNameRegistratorOutOfMemoryBonds1": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "100",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0x601080600c6000396000f200600035560f6009590060203560003557) [[ 0 ]] (CREATE 23 4 0xffffffff) }",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
+    "CallToNameRegistrator0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 1000000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 64 0) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x600035560f6009590060203560003557",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000000000000"
+        }
+    },
+
+    "CallToReturn1": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 1000000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 0 2) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x6001600157603760005560026000f2",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000000000000"
+        }
+    },
+
+    "PostToReturn1": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) (POST 1000000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 ) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x603760005560026000f2",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000000000000"
+        }
+    },
+
+    "callstatelessToReturn1": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLSTATELESS 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 0 2 ) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x6001600157603760005560026000f2",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000000000000"
+        }
+    },
+
+
+    "CallToNameRegistratorOutOfGas": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 100 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 64 0) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x600035560f6009590060203560003557",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "1000"
+        }
+    },
+
+    "CallToNameRegistratorTooMuchMemory0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 987654321 64 64 0) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x600035560f6009590060203560003557",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "1000"
+        }
+    },
+
+    "CallToNameRegistratorTooMuchMemory1": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 9865432 64 0) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x600035560f6009590060203560003557",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "1000"
+        }
+    },
+
+    "CallToNameRegistratorTooMuchMemory2": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 987654 1) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x600035560f6009590060203560003557",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "1000"
+        }
+    },
+
+
+    "CallToNameRegistratorNotMuchMemory0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 987654 0) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x600035560f6009590060203560003557",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "1000"
+        }
+    },
+
+    "CallToNameRegistratorNotMuchMemory1": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 987654 0 64 0) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x600035560f6009590060203560003557",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "1000"
+        }
+    },
+
+    "CallRecursiveBomb": {
+         "env" : {
+             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+             "currentNumber" : "0",
+             "currentGasLimit" : "10000000",
+             "currentDifficulty" : "256",
+             "currentTimestamp" : 1,
+             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+         },
+         "pre" : {
+             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                 "balance" : "20000000",
+                 "nonce" : 0,
+                 "code" : "{  (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 0 0)  }",
+                 "storage": {}
+             },
+             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                 "balance" : "1000000000000000000",
+                 "nonce" : 0,
+                 "code" : "{ [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 224) (ADDRESS) 0 0 0 0 0) } ",
+                 "storage": {}
+             }
+         },
+         "exec" : {
+             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+             "value" : "100000",
+             "data" : "",
+             "gasPrice" : "1",
+             "gas" : "20000000"
+         }
+     },
+
+    "suicide0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (SUICIDE (CALLER))}",
+                "storage": {}
+            },
+            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
+                "balance" : "23",
+                "code" : "0x600035560f6009590060203560003557",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "1000"
+        }
+    },
+
+    "suicideNotExistingAccount": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
+                "storage": {}
+            },
+            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
+                "balance" : "23",
+                "code" : "0x600035560f6009590060203560003557",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "1000"
+        }
+    },
+
+    "suicideSendEtherToMe": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (SUICIDE (ADDRESS) )}",
+                "storage": {}
+            },
+            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
+                "balance" : "23",
+                "code" : "0x600035560f6009590060203560003557",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "1000"
+        }
+    },
+
+    "return0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+           "cd1722f3947def4cf144679da39c4c32bdc35681" : {
+                "balance" : "23",
+                "code" : "{ (MSTORE8 0 55) (RETURN 0 1)}",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : "100000",
+            "data" : "0xaa",
+            "gasPrice" : "100000000000000",
+            "gas" : "1000"
+        }
+    },
+
+    "return1": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+           "cd1722f3947def4cf144679da39c4c32bdc35681" : {
+                "balance" : "23",
+                "code" : "{ (MSTORE8 0 55) (RETURN 0 2)}",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : "100000",
+            "data" : "0xaa",
+            "gasPrice" : "100000000000000",
+            "gas" : "1000"
+        }
+    },
+
+    "return2": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+           "cd1722f3947def4cf144679da39c4c32bdc35681" : {
+                "balance" : "23",
+                "code" : "{ (MSTORE8 0 55) (RETURN 0 33)}",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : "100000",
+            "data" : "0xaa",
+            "gasPrice" : "100000000000000",
+            "gas" : "1000"
+        }
+    },
+
+    "PostToNameRegistrator0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) (POST 1000000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 ) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x600035560f6009590060203560003557",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000000000000"
+        }
+    },
+
+    "callstatelessToNameRegistrator0": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "10000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLSTATELESS 1000000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 64 0) }",
+                "storage": {}
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "23",
+                "code" : "0x600035560f6009590060203560003557",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "100000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000000000000"
+        }
+    },
+
+
+
+
+    "TestNameRegistrator": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "0x600035560f6009590060203560003557",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffafffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    }
+
+
+
+
+}