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

CMakeLists.txt

@@ -305,6 +305,7 @@ endif()
 
 add_subdirectory(libdevcore)
 add_subdirectory(libevmcore)
+add_subdirectory(libevmasm)
 add_subdirectory(liblll)
 
 if (SERPENT)

alethzero/CMakeLists.txt

@@ -55,8 +55,7 @@ target_link_libraries(${EXECUTABLE} lll)
 if (SOLIDITY)
 	target_link_libraries(${EXECUTABLE} solidity)
 endif ()
-target_link_libraries(${EXECUTABLE} evmcore)
+target_link_libraries(${EXECUTABLE} evmasm)
-target_link_libraries(${EXECUTABLE} devcore)
 target_link_libraries(${EXECUTABLE} web3jsonrpc)
 target_link_libraries(${EXECUTABLE} jsqrc)
 target_link_libraries(${EXECUTABLE} natspec)

alethzero/Context.h

@@ -59,10 +59,10 @@ class Context
 public:
 	virtual ~Context();
 
-	virtual QString pretty(dev::Address _a) const = 0;
+	virtual std::string pretty(dev::Address const& _a) const = 0;
-	virtual QString prettyU256(dev::u256 _n) const = 0;
+	virtual std::string prettyU256(dev::u256 const& _n) const = 0;
-	virtual QString render(dev::Address _a) const = 0;
+	virtual std::pair<dev::Address, dev::bytes> fromString(std::string const& _a) const = 0;
-	virtual std::pair<dev::Address, dev::bytes> fromString(QString const& _a) const = 0;
 	virtual std::string renderDiff(dev::eth::StateDiff const& _d) const = 0;
+	virtual std::string render(dev::Address const& _a) const = 0;
 };
 

alethzero/Debugger.cpp

@@ -226,7 +226,7 @@ void Debugger::update()
 
 			QString stack;
 			for (auto i: ws.stack)
-				stack.prepend("<div>" + m_context->prettyU256(i) + "</div>");
+				stack.prepend("<div>" + QString::fromStdString(m_context->prettyU256(i)) + "</div>");
 			ui->debugStack->setHtml(stack);
 			ui->debugMemory->setHtml(QString::fromStdString(dev::memDump(ws.memory, 16, true)));
 			assert(m_session.codes.count(ws.code));
@@ -246,7 +246,7 @@ void Debugger::update()
 			ui->debugStateInfo->setText(QString::fromStdString(ss.str()));
 			stringstream s;
 			for (auto const& i: ws.storage)
-				s << "@" << m_context->prettyU256(i.first).toStdString() << "&nbsp;&nbsp;&nbsp;&nbsp;" << m_context->prettyU256(i.second).toStdString() << "<br/>";
+				s << "@" << m_context->prettyU256(i.first) << "&nbsp;&nbsp;&nbsp;&nbsp;" << m_context->prettyU256(i.second) << "<br/>";
 			ui->debugStorage->setHtml(QString::fromStdString(s.str()));
 		}
 	}

alethzero/DownloadView.cpp

@@ -39,13 +39,13 @@ void DownloadView::paintEvent(QPaintEvent*)
 	QPainter p(this);
 
 	p.fillRect(rect(), Qt::white);
-	if (!m_man || m_man->chain().empty() || !m_man->subCount())
+	if (!m_man || m_man->chainEmpty() || !m_man->subCount())
 		return;
 
 	double ratio = (double)rect().width() / rect().height();
 	if (ratio < 1)
 		ratio = 1 / ratio;
-	double n = min(16.0, min(rect().width(), rect().height()) / ceil(sqrt(m_man->chain().size() / ratio)));
+	double n = min(16.0, min(rect().width(), rect().height()) / ceil(sqrt(m_man->chainSize() / ratio)));
 
 //	QSizeF area(rect().width() / floor(rect().width() / n), rect().height() / floor(rect().height() / n));
 	QSizeF area(n, n);

alethzero/ExportState.cpp

@@ -129,8 +129,8 @@ void ExportStateDialog::fillContracts()
 	ui->contracts->setEnabled(true);
 	for (auto i: ethereum()->addresses(m_block))
 	{
-		QString r = m_main->render(i);
+		string r = m_main->render(i);
-		(new QListWidgetItem(QString("%2: %1 [%3]").arg(formatBalance(ethereum()->balanceAt(i)).c_str()).arg(r).arg((unsigned)ethereum()->countAt(i)), ethereum()->codeAt(i).empty() ? ui->accounts : ui->contracts))
+		(new QListWidgetItem(QString("%2: %1 [%3]").arg(formatBalance(ethereum()->balanceAt(i)).c_str()).arg(QString::fromStdString(r)).arg((unsigned)ethereum()->countAt(i)), ethereum()->codeAt(i).empty() ? ui->accounts : ui->contracts))
 			->setData(Qt::UserRole, QByteArray((char const*)i.data(), Address::size));
 	}
 }

alethzero/Main.ui

@@ -53,23 +53,23 @@
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="balance">
+       <widget class="QLabel" name="blockCount">
         <property name="text">
-         <string>0 wei</string>
+         <string>1 block</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="peerCount">
+       <widget class="QLabel" name="balance">
         <property name="text">
-         <string>0 peers</string>
+         <string>0 wei</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="blockCount">
+       <widget class="QLabel" name="peerCount">
         <property name="text">
-         <string>1 block</string>
+         <string>0 peers</string>
         </property>
        </widget>
       </item>
@@ -160,8 +160,8 @@
     <addaction name="killAccount"/>
     <addaction name="separator"/>
     <addaction name="loadJS"/>
-	<addaction name="separator"/>
+    <addaction name="separator"/>
-	<addaction name="exportState"/>
+    <addaction name="exportState"/>
    </widget>
    <widget class="QMenu" name="menu_Help">
     <property name="title">
@@ -190,7 +190,6 @@
      <string>&amp;View</string>
     </property>
     <addaction name="showAll"/>
-    <addaction name="showAllAccounts"/>
     <addaction name="separator"/>
     <addaction name="preview"/>
    </widget>
@@ -218,43 +217,6 @@
    <addaction name="menu_Debug"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
-  <widget class="QDockWidget" name="dockWidget_accounts">
-   <property name="features">
-    <set>QDockWidget::DockWidgetFeatureMask</set>
-   </property>
-   <property name="windowTitle">
-    <string>Accounts</string>
-   </property>
-   <attribute name="dockWidgetArea">
-    <number>2</number>
-   </attribute>
-   <widget class="QWidget" name="dockWidgetContents_2">
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QListWidget" name="accounts">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::NoFrame</enum>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
   <widget class="QDockWidget" name="dockWidget_3">
    <property name="features">
     <set>QDockWidget::DockWidgetFeatureMask</set>
@@ -590,18 +552,21 @@
     </layout>
    </widget>
   </widget>
-  <widget class="QDockWidget" name="dockWidget_contracts">
+  <widget class="QDockWidget" name="dockWidget_accounts">
    <property name="features">
     <set>QDockWidget::DockWidgetFeatureMask</set>
    </property>
    <property name="windowTitle">
-    <string>Contracts</string>
+    <string>Accounts</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>2</number>
    </attribute>
    <widget class="QWidget" name="dockWidgetContents_6">
     <layout class="QVBoxLayout" name="verticalLayout_2">
+     <property name="spacing">
+      <number>0</number>
+     </property>
      <property name="leftMargin">
       <number>0</number>
      </property>
@@ -614,12 +579,66 @@
      <property name="bottomMargin">
       <number>0</number>
      </property>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_12">
+       <item>
+        <widget class="QLineEdit" name="accountsFilter">
+         <property name="placeholderText">
+          <string>Filter...</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="showBasic">
+         <property name="text">
+          <string>Basic</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="showContracts">
+         <property name="text">
+          <string>Contracts</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="onlyNamed">
+         <property name="text">
+          <string>Only Named</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="refreshAccounts">
+         <property name="text">
+          <string>Refresh</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
      <item>
       <widget class="QSplitter" name="splitter_3">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <widget class="QListWidget" name="contracts">
+       <widget class="QListWidget" name="accounts">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
           <horstretch>0</horstretch>
@@ -633,7 +652,7 @@
          <enum>QFrame::NoFrame</enum>
         </property>
        </widget>
-       <widget class="QPlainTextEdit" name="contractInfo">
+       <widget class="QPlainTextEdit" name="accountInfo">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
           <horstretch>2</horstretch>
@@ -1482,7 +1501,7 @@ font-size: 14pt</string>
   </action>
   <action name="exportState">
    <property name="text">
-	<string>&amp;Export State...</string>
+    <string>&amp;Export State...</string>
    </property>
   </action>
   <action name="debugStepBack">

alethzero/MainWin.cpp

@@ -80,29 +80,29 @@ using namespace dev::p2p;
 using namespace dev::eth;
 namespace js = json_spirit;
 
-QString Main::fromRaw(h256 _n, unsigned* _inc)
+string Main::fromRaw(h256 _n, unsigned* _inc)
 {
 	if (_n)
 	{
 		string s((char const*)_n.data(), 32);
 		auto l = s.find_first_of('\0');
 		if (!l)
-			return QString();
+			return string();
 		if (l != string::npos)
 		{
 			auto p = s.find_first_not_of('\0', l);
 			if (!(p == string::npos || (_inc && p == 31)))
-				return QString();
+				return string();
 			if (_inc)
 				*_inc = (byte)s[31];
 			s.resize(l);
 		}
 		for (auto i: s)
 			if (i < 32)
-				return QString();
+				return string();
-		return QString::fromStdString(s);
+		return s;
 	}
-	return QString();
+	return string();
 }
 
 QString contentsOfQResource(string const& res)
@@ -145,7 +145,6 @@ Main::Main(QWidget *parent) :
 
 #if !ETH_FATDB
 	delete ui->dockWidget_accounts;
-	delete ui->dockWidget_contracts;
 #endif
 
 #if ETH_DEBUG
@@ -398,7 +397,7 @@ void Main::onNewBlock()
 	// update blockchain dependent views.
 	refreshBlockCount();
 	refreshBlockChain();
-	refreshAccounts();
+	ui->refreshAccounts->setEnabled(true);
 
 	// We must update balances since we can't filter updates to basic accounts.
 	refreshBalances();
@@ -410,7 +409,7 @@ void Main::onNewPending()
 
 	// update any pending-transaction dependent views.
 	refreshPending();
-	refreshAccounts();
+	ui->refreshAccounts->setEnabled(true);
 }
 
 void Main::on_forceMining_triggered()
@@ -510,33 +509,33 @@ static Public stringToPublic(QString const& _a)
 		return Public();
 }
 
-QString Main::pretty(dev::Address _a) const
+std::string Main::pretty(dev::Address const& _a) const
 {
 	auto g_newNameReg = getNameReg();
 
 	if (g_newNameReg)
 	{
-		QString s = QString::fromStdString(toString(abiOut<string32>(ethereum()->call(g_newNameReg, abiIn("getName(address)", _a)).output)));
+		string n = toString(abiOut<string32>(ethereum()->call(g_newNameReg, abiIn("name(address)", _a)).output));
-		if (s.size())
+		if (!n.empty())
-			return s;
+			return n;
 	}
-	return QString();
+	return string();
 }
 
-QString Main::render(dev::Address _a) const
+std::string Main::render(dev::Address const& _a) const
 {
-	QString p = pretty(_a);
+	string p = pretty(_a);
-	QString n;
+	string n;
-	try {
+	if (p.size() == 9 && p.find_first_not_of("QWERYUOPASDFGHJKLZXCVBNM1234567890") == string::npos)
-		n = QString::fromStdString(ICAP(_a).encoded());
+		p = ICAP(p, "XREG").encoded();
-	}
+	else
-	catch (...) {
+		DEV_IGNORE_EXCEPTIONS(n = ICAP(_a).encoded());
-		n = QString::fromStdString(_a.abridged());
+	if (n.empty())
-	}
+		n = _a.abridged();
-	return p.isEmpty() ? n : (p + " " + n);
+	return p.empty() ? n : (p + " " + n);
 }
 
-pair<Address, bytes> Main::fromString(QString const& _n) const
+pair<Address, bytes> Main::fromString(std::string const& _n) const
 {
 	if (_n == "(Create Contract)")
 		return make_pair(Address(), bytes());
@@ -544,7 +543,7 @@ pair<Address, bytes> Main::fromString(QString const& _n) const
 	auto g_newNameReg = getNameReg();
 	if (g_newNameReg)
 	{
-		Address a = abiOut<Address>(ethereum()->call(g_newNameReg, abiIn("addr(bytes32)", ::toString32(_n.toStdString()))).output);
+		Address a = abiOut<Address>(ethereum()->call(g_newNameReg, abiIn("addr(bytes32)", ::toString32(_n))).output);
 		if (a)
 			return make_pair(a, bytes());
 	}
@@ -552,7 +551,7 @@ pair<Address, bytes> Main::fromString(QString const& _n) const
 	{
 		try
 		{
-			return make_pair(Address(fromHex(_n.toStdString(), WhenError::Throw)), bytes());
+			return make_pair(Address(fromHex(_n, WhenError::Throw)), bytes());
 		}
 		catch (BadHexCharacter& _e)
 		{
@@ -568,7 +567,7 @@ pair<Address, bytes> Main::fromString(QString const& _n) const
 	}
 	else
 		try {
-			return ICAP::decoded(_n.toStdString()).address([&](Address const& a, bytes const& b) -> bytes
+			return ICAP::decoded(_n).address([&](Address const& a, bytes const& b) -> bytes
 			{
 				return ethereum()->call(a, b).output;
 			}, g_newNameReg);
@@ -600,7 +599,7 @@ QString Main::lookup(QString const& _a) const
 		return QString("%1.%2.%3.%4").arg((int)ret[28]).arg((int)ret[29]).arg((int)ret[30]).arg((int)ret[31]);
 	// TODO: support IPv6.
 	else if (ret)
-		return fromRaw(ret);
+		return QString::fromStdString(fromRaw(ret));
 	else
 		return _a;
 }
@@ -817,7 +816,7 @@ void Main::on_exportKey_triggered()
 	if (ui->ourAccounts->currentRow() >= 0 && ui->ourAccounts->currentRow() < m_myKeys.size())
 	{
 		auto k = m_myKeys[ui->ourAccounts->currentRow()];
-		QMessageBox::information(this, "Export Account Key", "Secret key to account " + render(k.address()) + " is:\n" + QString::fromStdString(toHex(k.sec().ref())));
+		QMessageBox::information(this, "Export Account Key", "Secret key to account " + QString::fromStdString(render(k.address()) + " is:\n" + toHex(k.sec().ref())));
 	}
 }
 
@@ -936,7 +935,7 @@ void Main::refreshBalances()
 	for (auto i: m_myKeys)
 	{
 		u256 b = ethereum()->balanceAt(i.address());
-		(new QListWidgetItem(QString("%2: %1 [%3]").arg(formatBalance(b).c_str()).arg(render(i.address())).arg((unsigned)ethereum()->countAt(i.address())), ui->ourAccounts))
+		(new QListWidgetItem(QString("%2: %1 [%3]").arg(formatBalance(b).c_str()).arg(QString::fromStdString(render(i.address()))).arg((unsigned)ethereum()->countAt(i.address())), ui->ourAccounts))
 			->setData(Qt::UserRole, QByteArray((char const*)i.address().data(), Address::size));
 		totalBalance += b;
 
@@ -968,24 +967,24 @@ void Main::refreshNetwork()
 		map<h512, QString> sessions;
 		for (PeerSessionInfo const& i: ps)
 			ui->peers->addItem(QString("[%8 %7] %3 ms - %1:%2 - %4 %5 %6")
-							   .arg(QString::fromStdString(i.host))
+				.arg(QString::fromStdString(i.host))
-							   .arg(i.port)
+				.arg(i.port)
-							   .arg(chrono::duration_cast<chrono::milliseconds>(i.lastPing).count())
+				.arg(chrono::duration_cast<chrono::milliseconds>(i.lastPing).count())
-							   .arg(sessions[i.id] = QString::fromStdString(i.clientVersion))
+				.arg(sessions[i.id] = QString::fromStdString(i.clientVersion))
-							   .arg(QString::fromStdString(toString(i.caps)))
+				.arg(QString::fromStdString(toString(i.caps)))
-							   .arg(QString::fromStdString(toString(i.notes)))
+				.arg(QString::fromStdString(toString(i.notes)))
-							   .arg(i.socketId)
+				.arg(i.socketId)
-							   .arg(QString::fromStdString(i.id.abridged())));
+				.arg(QString::fromStdString(i.id.abridged())));
 
 		auto ns = web3()->nodes();
 		for (p2p::Peer const& i: ns)
 			ui->nodes->insertItem(sessions.count(i.id) ? 0 : ui->nodes->count(), QString("[%1 %3] %2 - ( =%5s | /%4s%6 ) - *%7 $%8")
-						   .arg(QString::fromStdString(i.id.abridged()))
+				.arg(QString::fromStdString(i.id.abridged()))
-						   .arg(QString::fromStdString(i.endpoint.address.to_string()))
+				.arg(QString::fromStdString(i.endpoint.address.to_string()))
-						   .arg(i.id == web3()->id() ? "self" : sessions.count(i.id) ? sessions[i.id] : "disconnected")
+				.arg(i.id == web3()->id() ? "self" : sessions.count(i.id) ? sessions[i.id] : "disconnected")
-						   .arg(i.isOffline() ? " | " + QString::fromStdString(reasonOf(i.lastDisconnect())) + " | " + QString::number(i.failedAttempts()) + "x" : "")
+				.arg(i.isOffline() ? " | " + QString::fromStdString(reasonOf(i.lastDisconnect())) + " | " + QString::number(i.failedAttempts()) + "x" : "")
-						   .arg(i.rating())
+				.arg(i.rating())
-						   );
+				);
 	}
 }
 
@@ -994,7 +993,7 @@ void Main::refreshAll()
 	refreshBlockChain();
 	refreshBlockCount();
 	refreshPending();
-	refreshAccounts();
+	ui->refreshAccounts->setEnabled(true);
 	refreshBalances();
 }
 
@@ -1007,40 +1006,66 @@ void Main::refreshPending()
 		QString s = t.receiveAddress() ?
 			QString("%2 %5> %3: %1 [%4]")
 				.arg(formatBalance(t.value()).c_str())
-				.arg(render(t.safeSender()))
+				.arg(QString::fromStdString(render(t.safeSender())))
-				.arg(render(t.receiveAddress()))
+				.arg(QString::fromStdString(render(t.receiveAddress())))
 				.arg((unsigned)t.nonce())
 				.arg(ethereum()->codeAt(t.receiveAddress()).size() ? '*' : '-') :
 			QString("%2 +> %3: %1 [%4]")
 				.arg(formatBalance(t.value()).c_str())
-				.arg(render(t.safeSender()))
+				.arg(QString::fromStdString(render(t.safeSender())))
-				.arg(render(right160(sha3(rlpList(t.safeSender(), t.nonce())))))
+				.arg(QString::fromStdString(render(right160(sha3(rlpList(t.safeSender(), t.nonce()))))))
 				.arg((unsigned)t.nonce());
 		ui->transactionQueue->addItem(s);
 	}
 }
 
+void Main::on_accountsFilter_textChanged()
+{
+	ui->refreshAccounts->setEnabled(true);
+}
+
+void Main::on_showBasic_toggled()
+{
+	ui->refreshAccounts->setEnabled(true);
+}
+
+void Main::on_showContracts_toggled()
+{
+	ui->refreshAccounts->setEnabled(true);
+}
+
+void Main::on_onlyNamed_toggled()
+{
+	ui->refreshAccounts->setEnabled(true);
+}
+
+void Main::on_refreshAccounts_clicked()
+{
+	refreshAccounts();
+}
+
 void Main::refreshAccounts()
 {
-#if ETH_FATDB
+	DEV_TIMED_FUNCTION;
+#if ETH_FATDB || !ETH_TRUE
 	cwatch << "refreshAccounts()";
 	ui->accounts->clear();
-	ui->contracts->clear();
+	bool showContract = ui->showContracts->isChecked();
-	for (auto n = 0; n < 2; ++n)
+	bool showBasic = ui->showBasic->isChecked();
-		for (auto i: ethereum()->addresses())
+	bool onlyNamed = ui->onlyNamed->isChecked();
-		{
+	for (auto const& i: ethereum()->addresses())
-			auto r = render(i);
+	{
-			if (r.contains('(') == !n)
+		bool isContract = (ethereum()->codeHashAt(i) != EmptySHA3);
-			{
+		if (!((showContract && isContract) || (showBasic && !isContract)))
-				if (n == 0 || ui->showAllAccounts->isChecked())
+			continue;
-					(new QListWidgetItem(QString("%2: %1 [%3]").arg(formatBalance(ethereum()->balanceAt(i)).c_str()).arg(r).arg((unsigned)ethereum()->countAt(i)), ui->accounts))
+		string r = render(i);
-						->setData(Qt::UserRole, QByteArray((char const*)i.data(), Address::size));
+		if (onlyNamed && !(r.find('"') != string::npos || r.substr(0, 2) == "XE"))
-				if (ethereum()->codeAt(i).size())
+			continue;
-					(new QListWidgetItem(QString("%2: %1 [%3]").arg(formatBalance(ethereum()->balanceAt(i)).c_str()).arg(r).arg((unsigned)ethereum()->countAt(i)), ui->contracts))
+		(new QListWidgetItem(QString("%2: %1 [%3]").arg(formatBalance(ethereum()->balanceAt(i)).c_str()).arg(QString::fromStdString(r)).arg((unsigned)ethereum()->countAt(i)), ui->accounts))
-						->setData(Qt::UserRole, QByteArray((char const*)i.data(), Address::size));
+			->setData(Qt::UserRole, QByteArray((char const*)i.data(), Address::size));
-			}
+	}
-		}
 #endif
+	ui->refreshAccounts->setEnabled(false);
 }
 
 void Main::refreshBlockCount()
@@ -1057,6 +1082,7 @@ void Main::on_turboMining_triggered()
 
 void Main::refreshBlockChain()
 {
+	DEV_TIMED_FUNCTION;
 	cwatch << "refreshBlockChain()";
 
 	// TODO: keep the same thing highlighted.
@@ -1105,14 +1131,14 @@ void Main::refreshBlockChain()
 				QString s = t.receiveAddress() ?
 					QString("    %2 %5> %3: %1 [%4]")
 						.arg(formatBalance(t.value()).c_str())
-						.arg(render(t.safeSender()))
+						.arg(QString::fromStdString(render(t.safeSender())))
-						.arg(render(t.receiveAddress()))
+						.arg(QString::fromStdString(render(t.receiveAddress())))
 						.arg((unsigned)t.nonce())
 						.arg(ethereum()->codeAt(t.receiveAddress()).size() ? '*' : '-') :
 					QString("    %2 +> %3: %1 [%4]")
 						.arg(formatBalance(t.value()).c_str())
-						.arg(render(t.safeSender()))
+						.arg(QString::fromStdString(render(t.safeSender())))
-						.arg(render(right160(sha3(rlpList(t.safeSender(), t.nonce())))))
+						.arg(QString::fromStdString(render(right160(sha3(rlpList(t.safeSender(), t.nonce()))))))
 						.arg((unsigned)t.nonce());
 				QListWidgetItem* txItem = new QListWidgetItem(s, ui->blocks);
 				auto hba = QByteArray((char const*)h.data(), h.size);
@@ -1256,7 +1282,7 @@ string Main::renderDiff(StateDiff const& _d) const
 		s << "<hr/>";
 
 		AccountDiff ad = i.second;
-		s << "<code style=\"white-space: pre; font-weight: bold\">" << lead(ad.changeType()) << "  </code>" << " <b>" << render(i.first).toStdString() << "</b>";
+		s << "<code style=\"white-space: pre; font-weight: bold\">" << lead(ad.changeType()) << "  </code>" << " <b>" << render(i.first) << "</b>";
 		if (!ad.exist.to())
 			continue;
 
@@ -1289,7 +1315,7 @@ string Main::renderDiff(StateDiff const& _d) const
 				s << " * ";
 			s << "  </code>";
 
-			s << prettyU256(i.first).toStdString();
+			s << prettyU256(i.first);
 /*			if (i.first > u256(1) << 246)
 				s << (h256)i.first;
 			else if (i.first > u160(1) << 150)
@@ -1298,11 +1324,11 @@ string Main::renderDiff(StateDiff const& _d) const
 				s << hex << i.first;
 */
 			if (!i.second.from())
-				s << ": " << prettyU256(i.second.to()).toStdString();
+				s << ": " << prettyU256(i.second.to());
 			else if (!i.second.to())
-				s << " (" << prettyU256(i.second.from()).toStdString() << ")";
+				s << " (" << prettyU256(i.second.from()) << ")";
 			else
-				s << ": " << prettyU256(i.second.to()).toStdString() << " (" << prettyU256(i.second.from()).toStdString() << ")";
+				s << ": " << prettyU256(i.second.to()) << " (" << prettyU256(i.second.from()) << ")";
 		}
 	}
 	return s.str();
@@ -1321,11 +1347,11 @@ void Main::on_transactionQueue_currentItemChanged()
 		auto ss = tx.safeSender();
 		h256 th = sha3(rlpList(ss, tx.nonce()));
 		s << "<h3>" << th << "</h3>";
-		s << "From: <b>" << pretty(ss).toStdString() << "</b> " << ss;
+		s << "From: <b>" << pretty(ss) << "</b> " << ss;
 		if (tx.isCreation())
-			s << "<br/>Creates: <b>" << pretty(right160(th)).toStdString() << "</b> " << right160(th);
+			s << "<br/>Creates: <b>" << pretty(right160(th)) << "</b> " << right160(th);
 		else
-			s << "<br/>To: <b>" << pretty(tx.receiveAddress()).toStdString() << "</b> " << tx.receiveAddress();
+			s << "<br/>To: <b>" << pretty(tx.receiveAddress()) << "</b> " << tx.receiveAddress();
 		s << "<br/>Value: <b>" << formatBalance(tx.value()) << "</b>";
 		s << "&nbsp;&emsp;&nbsp;#<b>" << tx.nonce() << "</b>";
 		s << "<br/>Gas price: <b>" << formatBalance(tx.gasPrice()) << "</b>";
@@ -1413,6 +1439,11 @@ void Main::on_injectBlock_triggered()
 	}
 }
 
+static string htmlEscaped(string const& _s)
+{
+	return QString::fromStdString(_s).toHtmlEscaped().toStdString();
+}
+
 void Main::on_blocks_currentItemChanged()
 {
 	ui->info->clear();
@@ -1442,7 +1473,7 @@ void Main::on_blocks_currentItemChanged()
 			s << "<div>D/TD: <b>" << info.difficulty << "</b>/<b>" << details.totalDifficulty << "</b> = 2^" << log2((double)info.difficulty) << "/2^" << log2((double)details.totalDifficulty) << "</div>";
 			s << "&nbsp;&emsp;&nbsp;Children: <b>" << details.children.size() << "</b></div>";
 			s << "<div>Gas used/limit: <b>" << info.gasUsed << "</b>/<b>" << info.gasLimit << "</b>" << "</div>";
-			s << "<div>Beneficiary: <b>" << pretty(info.coinbaseAddress).toHtmlEscaped().toStdString() << " " << info.coinbaseAddress << "</b>" << "</div>";
+			s << "<div>Beneficiary: <b>" << htmlEscaped(pretty(info.coinbaseAddress)) << " " << info.coinbaseAddress << "</b>" << "</div>";
 			s << "<div>Seed hash: <b>" << info.seedHash() << "</b>" << "</div>";
 			s << "<div>Mix hash: <b>" << info.mixHash << "</b>" << "</div>";
 			s << "<div>Nonce: <b>" << info.nonce << "</b>" << "</div>";
@@ -1473,7 +1504,7 @@ void Main::on_blocks_currentItemChanged()
 				s << line << "Hash: <b>" << uncle.hash() << "</b>" << "</div>";
 				s << line << "Parent: <b>" << uncle.parentHash << "</b>" << "</div>";
 				s << line << "Number: <b>" << uncle.number << "</b>" << "</div>";
-				s << line << "Coinbase: <b>" << pretty(uncle.coinbaseAddress).toHtmlEscaped().toStdString() << " " << uncle.coinbaseAddress << "</b>" << "</div>";
+				s << line << "Coinbase: <b>" << htmlEscaped(pretty(uncle.coinbaseAddress)) << " " << uncle.coinbaseAddress << "</b>" << "</div>";
 				s << line << "Seed hash: <b>" << uncle.seedHash() << "</b>" << "</div>";
 				s << line << "Mix hash: <b>" << uncle.mixHash << "</b>" << "</div>";
 				s << line << "Nonce: <b>" << uncle.nonce << "</b>" << "</div>";
@@ -1508,11 +1539,11 @@ void Main::on_blocks_currentItemChanged()
 			TransactionReceipt receipt = ethereum()->blockChain().receipts(h).receipts[txi];
 			s << "<h3>" << th << "</h3>";
 			s << "<h4>" << h << "[<b>" << txi << "</b>]</h4>";
-			s << "<div>From: <b>" << pretty(ss).toHtmlEscaped().toStdString() << " " << ss << "</b>" << "</div>";
+			s << "<div>From: <b>" << htmlEscaped(pretty(ss)) << " " << ss << "</b>" << "</div>";
 			if (tx.isCreation())
-				s << "<div>Creates: <b>" << pretty(right160(th)).toHtmlEscaped().toStdString() << "</b> " << right160(th) << "</div>";
+				s << "<div>Creates: <b>" << htmlEscaped(pretty(right160(th))) << "</b> " << right160(th) << "</div>";
 			else
-				s << "<div>To: <b>" << pretty(tx.receiveAddress()).toHtmlEscaped().toStdString() << "</b> " << tx.receiveAddress() << "</div>";
+				s << "<div>To: <b>" << htmlEscaped(pretty(tx.receiveAddress())) << "</b> " << tx.receiveAddress() << "</div>";
 			s << "<div>Value: <b>" << formatBalance(tx.value()) << "</b>" << "</div>";
 			s << "&nbsp;&emsp;&nbsp;#<b>" << tx.nonce() << "</b>" << "</div>";
 			s << "<div>Gas price: <b>" << formatBalance(tx.gasPrice()) << "</b>" << "</div>";
@@ -1590,10 +1621,10 @@ void Main::debugDumpState(int _add)
 	}
 }
 
-void Main::on_contracts_currentItemChanged()
+void Main::on_accounts_currentItemChanged()
 {
-	ui->contractInfo->clear();
+	ui->accountInfo->clear();
-	if (auto item = ui->contracts->currentItem())
+	if (auto item = ui->accounts->currentItem())
 	{
 		auto hba = item->data(Qt::UserRole).toByteArray();
 		assert(hba.size() == 20);
@@ -1604,16 +1635,16 @@ void Main::on_contracts_currentItemChanged()
 		{
 			auto storage = ethereum()->storageAt(address);
 			for (auto const& i: storage)
-				s << "@" << showbase << hex << prettyU256(i.first).toStdString() << "&nbsp;&nbsp;&nbsp;&nbsp;" << showbase << hex << prettyU256(i.second).toStdString() << "<br/>";
+				s << "@" << showbase << hex << prettyU256(i.first) << "&nbsp;&nbsp;&nbsp;&nbsp;" << showbase << hex << prettyU256(i.second) << "<br/>";
 			s << "<h4>Body Code (" << sha3(ethereum()->codeAt(address)).abridged() << ")</h4>" << disassemble(ethereum()->codeAt(address));
 			s << Div(Mono) << toHex(ethereum()->codeAt(address)) << "</div>";
-			ui->contractInfo->appendHtml(QString::fromStdString(s.str()));
+			ui->accountInfo->appendHtml(QString::fromStdString(s.str()));
 		}
 		catch (dev::InvalidTrie)
 		{
-			ui->contractInfo->appendHtml("Corrupted trie.");
+			ui->accountInfo->appendHtml("Corrupted trie.");
 		}
-		ui->contractInfo->moveCursor(QTextCursor::Start);
+		ui->accountInfo->moveCursor(QTextCursor::Start);
 	}
 }
 
@@ -1645,16 +1676,6 @@ void Main::on_accounts_doubleClicked()
 	}
 }
 
-void Main::on_contracts_doubleClicked()
-{
-	if (ui->contracts->count())
-	{
-		auto hba = ui->contracts->currentItem()->data(Qt::UserRole).toByteArray();
-		auto h = Address((byte const*)hba.data(), Address::ConstructFromPointer);
-		qApp->clipboard()->setText(QString::fromStdString(toHex(h.asArray())));
-	}
-}
-
 static shh::FullTopic topicFromText(QString _s)
 {
 	shh::BuildTopic ret;
@@ -1885,7 +1906,12 @@ void Main::on_killAccount_triggered()
 	if (ui->ourAccounts->currentRow() >= 0 && ui->ourAccounts->currentRow() < m_myKeys.size())
 	{
 		auto k = m_myKeys[ui->ourAccounts->currentRow()];
-		if (ethereum()->balanceAt(k.address()) != 0 && QMessageBox::critical(this, "Kill Account?!", "Account " + render(k.address()) + " has " + QString::fromStdString(formatBalance(ethereum()->balanceAt(k.address()))) + " in it. It, and any contract that this account can access, will be lost forever if you continue. Do NOT continue unless you know what you are doing.\nAre you sure you want to continue?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
+		if (
+			ethereum()->balanceAt(k.address()) != 0 &&
+			QMessageBox::critical(this, "Kill Account?!",
+				QString::fromStdString("Account " + render(k.address()) + " has " + formatBalance(ethereum()->balanceAt(k.address())) + " in it. It, and any contract that this account can access, will be lost forever if you continue. Do NOT continue unless you know what you are doing.\n"
+				"Are you sure you want to continue?"),
+				QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
 			return;
 		m_myKeys.erase(m_myKeys.begin() + ui->ourAccounts->currentRow());
 		keysChanged();
@@ -1902,10 +1928,10 @@ void Main::on_go_triggered()
 	web3()->addNode(p2p::NodeId(), Host::pocHost());
 }
 
-QString Main::prettyU256(dev::u256 _n) const
+std::string Main::prettyU256(dev::u256 const& _n) const
 {
 	unsigned inc = 0;
-	QString raw;
+	string raw;
 	ostringstream s;
 	if (_n > szabo && _n < 1000000 * ether)
 		s << "<span style=\"color: #215\">" << formatBalance(_n) << "</span> <span style=\"color: #448\">(0x" << hex << (uint64_t)_n << ")</span>";
@@ -1916,17 +1942,17 @@ QString Main::prettyU256(dev::u256 _n) const
 	else if ((_n >> 160) == 0)
 	{
 		Address a = right160(_n);
-		QString n = pretty(a);
+		string n = pretty(a);
-		if (n.isNull())
+		if (n.empty())
 			s << "<span style=\"color: #844\">0x</span><span style=\"color: #800\">" << a << "</span>";
 		else
-			s << "<span style=\"font-weight: bold; color: #800\">" << n.toHtmlEscaped().toStdString() << "</span> (<span style=\"color: #844\">0x</span><span style=\"color: #800\">" << a.abridged() << "</span>)";
+			s << "<span style=\"font-weight: bold; color: #800\">" << htmlEscaped(n) << "</span> (<span style=\"color: #844\">0x</span><span style=\"color: #800\">" << a.abridged() << "</span>)";
 	}
 	else if ((raw = fromRaw((h256)_n, &inc)).size())
-		return "<span style=\"color: #484\">\"</span><span style=\"color: #080\">" + raw.toHtmlEscaped() + "</span><span style=\"color: #484\">\"" + (inc ? " + " + QString::number(inc) : "") + "</span>";
+		return "<span style=\"color: #484\">\"</span><span style=\"color: #080\">" + htmlEscaped(raw) + "</span><span style=\"color: #484\">\"" + (inc ? " + " + toString(inc) : "") + "</span>";
 	else
 		s << "<span style=\"color: #466\">0x</span><span style=\"color: #044\">" << (h256)_n << "</span>";
-	return QString::fromStdString(s.str());
+	return s.str();
 }
 
 void Main::on_post_clicked()

alethzero/MainWin.h

@@ -80,10 +80,10 @@ public:
 	bool confirm() const;
 	NatSpecFace* natSpec() { return &m_natSpecDB; }
 
-	QString pretty(dev::Address _a) const override;
+	std::string pretty(dev::Address const& _a) const override;
-	QString prettyU256(dev::u256 _n) const override;
+	std::string prettyU256(dev::u256 const& _n) const override;
-	QString render(dev::Address _a) const override;
+	std::string render(dev::Address const& _a) const override;
-	std::pair<dev::Address, dev::bytes> fromString(QString const& _a) const override;
+	std::pair<dev::Address, dev::bytes> fromString(std::string const& _a) const override;
 	std::string renderDiff(dev::eth::StateDiff const& _d) const override;
 
 	QList<dev::KeyPair> owned() const { return m_myIdentities + m_myKeys; }
@@ -131,6 +131,13 @@ private slots:
 	void on_importKeyFile_triggered();
 	void on_exportKey_triggered();
 
+	// Account pane
+	void on_accountsFilter_textChanged();
+	void on_showBasic_toggled();
+	void on_showContracts_toggled();
+	void on_onlyNamed_toggled();
+	void on_refreshAccounts_clicked();
+
 	// Tools
 	void on_newTransaction_triggered();
 	void on_loadJS_triggered();
@@ -140,8 +147,7 @@ private slots:
 	void ourAccountsRowsMoved();
 	void on_ourAccounts_doubleClicked();
 	void on_accounts_doubleClicked();
-	void on_contracts_doubleClicked();
+	void on_accounts_currentItemChanged();
-	void on_contracts_currentItemChanged();
 	void on_transactionQueue_currentItemChanged();
 	void on_blockChainFilter_textChanged();
 	void on_blocks_currentItemChanged();
@@ -254,7 +260,7 @@ private:
 	std::unique_ptr<jsonrpc::HttpServer> m_httpConnector;
 	std::unique_ptr<OurWebThreeStubServer> m_server;
 
-	static QString fromRaw(dev::h256 _n, unsigned* _inc = nullptr);
+	static std::string fromRaw(dev::h256 _n, unsigned* _inc = nullptr);
 	NatspecHandler m_natSpecDB;
 
 	Transact m_transact;

alethzero/OurWebThreeStubServer.cpp

@@ -73,7 +73,7 @@ bool OurWebThreeStubServer::showCreationNotice(TransactionSkeleton const& _t, bo
 
 bool OurWebThreeStubServer::showSendNotice(TransactionSkeleton const& _t, bool _toProxy)
 {
-	return showAuthenticationPopup("Fund Transfer Transaction", "ÐApp is attempting to send " + formatBalance(_t.value) + " to a recipient " + m_main->pretty(_t.to).toStdString() + (_toProxy ? " (this transaction is not executed directly, but forwarded to another ÐApp)" : "") +
+	return showAuthenticationPopup("Fund Transfer Transaction", "ÐApp is attempting to send " + formatBalance(_t.value) + " to a recipient " + m_main->pretty(_t.to) + (_toProxy ? " (this transaction is not executed directly, but forwarded to another ÐApp)" : "") +
 ", with additional network fees of up to " + formatBalance(_t.gas * _t.gasPrice) + ".\n\nMaximum total cost is " + formatBalance(_t.value + _t.gas * _t.gasPrice) + ".");
 }
 
@@ -81,7 +81,7 @@ bool OurWebThreeStubServer::showUnknownCallNotice(TransactionSkeleton const& _t,
 {
 	return showAuthenticationPopup("DANGEROUS! Unknown Contract Transaction!",
 		"ÐApp is attempting to call into an unknown contract at address " +
-		m_main->pretty(_t.to).toStdString() + ".\n\n" +
+		m_main->pretty(_t.to) + ".\n\n" +
 		(_toProxy ? "This transaction is not executed directly, but forwarded to another ÐApp.\n\n" : "")  +
 		"Call involves sending " +
 		formatBalance(_t.value) + " to the recipient, with additional network fees of up to " +
@@ -137,7 +137,7 @@ bool OurWebThreeStubServer::validateTransaction(TransactionSkeleton const& _t, b
 	// otherwise it's a transaction to a contract for which we have the natspec
 	return showAuthenticationPopup("Contract Transaction",
 		"ÐApp attempting to conduct contract interaction with " +
-		m_main->pretty(_t.to).toStdString() +
+		m_main->pretty(_t.to) +
 		": <b>" + userNotice + "</b>.\n\n" +
 		(_toProxy ? "This transaction is not executed directly, but forwarded to another ÐApp.\n\n" : "") +
 		(_t.value > 0 ?

alethzero/Transact.cpp

@@ -110,12 +110,12 @@ void Transact::updateDestination()
 	cwatch << "updateDestination()";
 	QString s;
 	for (auto i: ethereum()->addresses())
-		if ((s = m_context->pretty(i)).size())
+		if ((s = QString::fromStdString(m_context->pretty(i))).size())
 			// A namereg address
 			if (ui->destination->findText(s, Qt::MatchExactly | Qt::MatchCaseSensitive) == -1)
 				ui->destination->addItem(s);
 	for (int i = 0; i < ui->destination->count(); ++i)
-		if (ui->destination->itemText(i) != "(Create Contract)" && !m_context->fromString(ui->destination->itemText(i)).first)
+		if (ui->destination->itemText(i) != "(Create Contract)" && !m_context->fromString(ui->destination->itemText(i).toStdString()).first)
 			ui->destination->removeItem(i--);
 }
 
@@ -142,9 +142,9 @@ void Transact::on_destination_currentTextChanged(QString)
 {
 	if (ui->destination->currentText().size() && ui->destination->currentText() != "(Create Contract)")
 	{
-		auto p = m_context->fromString(ui->destination->currentText());
+		auto p = m_context->fromString(ui->destination->currentText().toStdString());
 		if (p.first)
-			ui->calculatedName->setText(m_context->render(p.first));
+			ui->calculatedName->setText(QString::fromStdString(m_context->render(p.first)));
 		else
 			ui->calculatedName->setText("Unknown Address");
 		if (!p.second.empty())
@@ -347,7 +347,7 @@ void Transact::rejigData()
 	else
 	{
 		// TODO: cache like m_data.
-		to = m_context->fromString(ui->destination->currentText()).first;
+		to = m_context->fromString(ui->destination->currentText().toStdString()).first;
 		er = ethereum()->call(s, value(), to, m_data, gasNeeded, gasPrice());
 	}
 	gasNeeded = (qint64)(er.gasUsed + er.gasRefunded);
@@ -434,7 +434,7 @@ void Transact::on_send_clicked()
 	}
 	else
 		// TODO: cache like m_data.
-		ethereum()->submitTransaction(s, value(), m_context->fromString(ui->destination->currentText()).first, m_data, ui->gas->value(), gasPrice());
+		ethereum()->submitTransaction(s, value(), m_context->fromString(ui->destination->currentText().toStdString()).first, m_data, ui->gas->value(), gasPrice());
 	close();
 }
 
@@ -453,7 +453,7 @@ void Transact::on_debug_clicked()
 		State st(ethereum()->postState());
 		Transaction t = isCreation() ?
 			Transaction(value(), gasPrice(), ui->gas->value(), m_data, st.transactionsFrom(dev::toAddress(s)), s) :
-			Transaction(value(), gasPrice(), ui->gas->value(), m_context->fromString(ui->destination->currentText()).first, m_data, st.transactionsFrom(dev::toAddress(s)), s);
+			Transaction(value(), gasPrice(), ui->gas->value(), m_context->fromString(ui->destination->currentText().toStdString()).first, m_data, st.transactionsFrom(dev::toAddress(s)), s);
 		Debugger dw(m_context, this);
 		Executive e(st, ethereum()->blockChain(), 0);
 		dw.populate(e, t);

cmake/EthCompilerSettings.cmake

@@ -9,14 +9,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
 	set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG -DETH_RELEASE")
 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DETH_RELEASE")
 
-	if (PROFILING)
-		set(CMAKE_CXX_FLAGS "-g ${CMAKE_CXX_FLAGS}")
-		add_definitions(-DETH_PROFILING_GPERF)
-		set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lprofiler")
-#		set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -lprofiler")
-		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lprofiler")
-	endif ()
-
 	execute_process(
 		COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
 	if (NOT (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7))
@@ -61,6 +53,14 @@ else ()
 	message(WARNING "Your compiler is not tested, if you run into any issues, we'd welcome any patches.")
 endif ()
 
+if (PROFILING AND (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")))
+	set(CMAKE_CXX_FLAGS "-g ${CMAKE_CXX_FLAGS}")
+	add_definitions(-DETH_PROFILING_GPERF)
+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lprofiler")
+#	set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -lprofiler")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lprofiler")
+endif ()
+
 if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))
 	option(USE_LD_GOLD "Use GNU gold linker" ON)
 	if (USE_LD_GOLD)

evmjit/libevmjit-cpp/Env.cpp

@@ -1,7 +1,7 @@
 
 #pragma GCC diagnostic ignored "-Wconversion"
 #include <libdevcrypto/SHA3.h>
-#include <libethcore/Params.h>
+#include <libevmcore/Params.h>
 #include <libevm/ExtVMFace.h>
 
 #include "Utils.h"

libdevcore/Common.cpp

@@ -21,6 +21,7 @@
 
 #include "Common.h"
 #include "Exceptions.h"
+#include "Log.h"
 using namespace std;
 using namespace dev;
 
@@ -35,5 +36,10 @@ void HasInvariants::checkInvariants() const
 		BOOST_THROW_EXCEPTION(FailedInvariant());
 }
 
+TimerHelper::~TimerHelper()
+{
+	cdebug << "Timer" << id << t.elapsed() << "s";
+}
+
 }
 

libdevcore/Common.h

@@ -37,6 +37,7 @@
 #include <vector>
 #include <set>
 #include <functional>
+#include <boost/timer.hpp>
 #pragma warning(push)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -168,6 +169,25 @@ private:
 #define DEV_INVARIANT_CHECK (void)0;
 #endif
 
+class TimerHelper
+{
+public:
+	TimerHelper(char const* _id): id(_id) {}
+	~TimerHelper();
+
+private:
+	boost::timer t;
+	char const* id;
+};
+
+#define DEV_TIMED(S) for (::std::pair<::dev::TimerHelper, bool> __eth_t(#S, true); __eth_t.second; __eth_t.second = false)
+#define DEV_TIMED_SCOPE(S) ::dev::TimerHelper __eth_t(S)
+#if WIN32
+#define DEV_TIMED_FUNCTION DEV_TIMED_SCOPE(__FUNCSIG__)
+#else
+#define DEV_TIMED_FUNCTION DEV_TIMED_SCOPE(__PRETTY_FUNCTION__)
+#endif
+
 enum class WithExisting: int
 {
 	Trust = 0,

libdevcore/FixedHash.h

@@ -64,6 +64,9 @@ public:
 	/// Convert from the corresponding arithmetic type.
 	FixedHash(Arith const& _arith) { toBigEndian(_arith, m_data); }
 
+	/// Convert from unsigned
+	explicit FixedHash(unsigned _u) { toBigEndian(_u, m_data); }
+
 	/// Explicitly construct, copying from a byte array.
 	explicit FixedHash(bytes const& _b, ConstructFromHashType _t = FailIfDifferent) { if (_b.size() == N) memcpy(m_data.data(), _b.data(), std::min<unsigned>(_b.size(), N)); else { m_data.fill(0); if (_t != FailIfDifferent) { auto c = std::min<unsigned>(_b.size(), N); for (unsigned i = 0; i < c; ++i) m_data[_t == AlignRight ? N - 1 - i : i] = _b[_t == AlignRight ? _b.size() - 1 - i : i]; } } }
 
@@ -80,7 +83,7 @@ public:
 	operator Arith() const { return fromBigEndian<Arith>(m_data); }
 
 	/// @returns true iff this is the empty hash.
-	explicit operator bool() const { return ((Arith)*this) != 0; }
+	explicit operator bool() const { return std::any_of(m_data.begin(), m_data.end(), [](byte _b) { return _b != 0; }); }
 
 	// The obvious comparison operators.
 	bool operator==(FixedHash const& _c) const { return m_data == _c.m_data; }

libdevcore/Guards.h

@@ -22,6 +22,7 @@
 #pragma once
 
 #include <mutex>
+#include <atomic>
 #include <boost/thread.hpp>
 
 namespace dev
@@ -61,6 +62,18 @@ struct GenericUnguardSharedBool
 	MutexType& m;
 };
 
+/** @brief Simple lock that waits for release without making context switch */
+class SpinLock
+{
+public:
+	SpinLock() { m_lock.clear(); }
+	void lock() { while (m_lock.test_and_set(std::memory_order_acquire)) {} }
+	void unlock() { m_lock.clear(std::memory_order_release); }
+private:
+	std::atomic_flag m_lock;
+};
+using SpinGuard = std::lock_guard<SpinLock>;
+
 /** @brief Simple block guard.
  * The expression/block following is guarded though the given mutex.
  * Usage:

libdevcore/Log.cpp

@@ -158,8 +158,8 @@ void dev::setThreadName(string const& _n)
 
 void dev::simpleDebugOut(std::string const& _s, char const*)
 {
-	static Mutex s_lock;
+	static SpinLock s_lock;
-	Guard l(s_lock);
+	SpinGuard l(s_lock);
 
 	cerr << _s << endl << flush;
 

libethcore/BlockInfo.cpp

@@ -23,10 +23,10 @@
 #include <libdevcore/RLP.h>
 #include <libdevcrypto/TrieDB.h>
 #include <libethcore/Common.h>
+#include <libethcore/Params.h>
 #include "EthashAux.h"
 #include "ProofOfWork.h"
 #include "Exceptions.h"
-#include "Params.h"
 #include "BlockInfo.h"
 using namespace std;
 using namespace dev;

libethcore/CMakeLists.txt

@@ -28,7 +28,7 @@ add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 target_link_libraries(${EXECUTABLE} ethash)
 target_link_libraries(${EXECUTABLE} devcrypto)
-target_link_libraries(${EXECUTABLE} devcore)
+target_link_libraries(${EXECUTABLE} evmcore)
 
 if (ETHASHCL)
 	target_link_libraries(${EXECUTABLE} ethash-cl)

libethcore/EthashAux.cpp

@@ -33,7 +33,6 @@
 #include <libdevcrypto/CryptoPP.h>
 #include <libdevcrypto/SHA3.h>
 #include <libdevcrypto/FileSystem.h>
-#include <libethcore/Params.h>
 #include "BlockInfo.h"
 using namespace std;
 using namespace chrono;
@@ -87,13 +86,10 @@ ethash_params EthashAux::params(h256 const& _seedHash)
 {
 	Guard l(get()->x_epochs);
 	unsigned epoch = 0;
-	try
+	auto epochIter = get()->m_epochs.find(_seedHash);
+	if (epochIter == get()->m_epochs.end())
 	{
-		epoch = get()->m_epochs.at(_seedHash);
+		//		cdebug << "Searching for seedHash " << _seedHash;
-	}
-	catch (...)
-	{
-//		cdebug << "Searching for seedHash " << _seedHash;
 		for (h256 h; h != _seedHash && epoch < 2048; ++epoch, h = sha3(h), get()->m_epochs[h] = epoch) {}
 		if (epoch == 2048)
 		{
@@ -102,6 +98,8 @@ ethash_params EthashAux::params(h256 const& _seedHash)
 			throw std::invalid_argument(error.str());
 		}
 	}
+	else
+		epoch = epochIter->second;
 	return params(epoch * ETHASH_EPOCH_LENGTH);
 }
 

libethcore/ICAP.h

@@ -51,8 +51,6 @@ public:
 	ICAP() = default;
 	/// Construct a direct ICAP object for given target address. Must have a zero first byte.
 	ICAP(Address const& _target): m_type(Direct), m_direct(_target) {}
-	/// Construct an indirect ICAP object for given target name.
-	ICAP(std::string const& _target): m_type(Indirect), m_client(boost::algorithm::to_upper_copy(_target)), m_asset("ETH") {}
 	/// Construct an indirect ICAP object for given client and institution names.
 	ICAP(std::string const& _client, std::string const& _inst): m_type(Indirect), m_client(boost::algorithm::to_upper_copy(_client)), m_institution(boost::algorithm::to_upper_copy(_inst)), m_asset("XET") {}
 	/// Construct an indirect ICAP object for given client, institution and asset names. You generally don't want to use this.

libethcore/Params.cpp

@@ -14,7 +14,7 @@
 	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 FeeStructure.cpp
+/** @file Params.cpp
  * @author Gav Wood <i@gavwood.com>
  * @date 2014
  */
@@ -36,40 +36,6 @@ u256 const c_gasLimitBoundDivisor = 1024;
 u256 const c_minimumDifficulty = 131072;
 u256 const c_difficultyBoundDivisor = 2048;
 u256 const c_durationLimit = 8;
-u256 const c_stackLimit = 1024;
-u256 const c_tierStepGas[] = {0, 2, 3, 5, 8, 10, 20, 0};
-u256 const c_expGas = 10;
-u256 const c_expByteGas = 10;
-u256 const c_sha3Gas = 30;
-u256 const c_sha3WordGas = 6;
-u256 const c_sloadGas = 50;
-u256 const c_sstoreSetGas = 20000;
-u256 const c_sstoreResetGas = 5000;
-u256 const c_sstoreRefundGas = 15000;
-u256 const c_jumpdestGas = 1;
-u256 const c_logGas = 375;
-u256 const c_logDataGas = 8;
-u256 const c_logTopicGas = 375;
-u256 const c_createGas = 32000;
-u256 const c_callGas = 40;
-u256 const c_callStipend = 2300;
-u256 const c_callValueTransferGas = 9000;
-u256 const c_callNewAccountGas = 25000;
-u256 const c_suicideRefundGas = 24000;
-u256 const c_memoryGas = 3;
-u256 const c_quadCoeffDiv = 512;
-u256 const c_createDataGas = 200;
-u256 const c_txGas = 21000;
-u256 const c_txDataZeroGas = 4;
-u256 const c_txDataNonZeroGas = 68;
-u256 const c_copyGas = 3;
-u256 const c_ecrecoverGas = 3000;
-u256 const c_sha256Gas = 60;
-u256 const c_sha256WordGas = 12;
-u256 const c_ripemd160Gas = 600;
-u256 const c_ripemd160WordGas = 120;
-u256 const c_identityGas = 15;
-u256 const c_identityWordGas = 3;
 //--- END: AUTOGENERATED FROM /feeStructure.json
 
 }

libethcore/Params.h

@@ -14,7 +14,7 @@
 	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 FeeStructure.h
+/** @file Params.h
  * @author Gav Wood <i@gavwood.com>
  * @date 2014
  */
@@ -37,41 +37,6 @@ extern u256 const c_minimumDifficulty;
 extern u256 const c_difficultyBoundDivisor;
 extern u256 const c_durationLimit;
 extern u256 const c_maximumExtraDataSize;
-extern u256 const c_stackLimit;
-
-extern u256 const c_tierStepGas[8];			///< Once per operation, for a selection of them.
-extern u256 const c_expGas;					///< Once per EXP instuction.
-extern u256 const c_expByteGas;				///< Times ceil(log256(exponent)) for the EXP instruction.
-extern u256 const c_sha3Gas;				///< Once per SHA3 operation.
-extern u256 const c_sha3WordGas;			///< Once per word of the SHA3 operation's data.
-extern u256 const c_copyGas;				///< Multiplied by the number of 32-byte words that are copied (round up) for any *COPY operation and added.
-extern u256 const c_sloadGas;				///< Once per SLOAD operation.
-extern u256 const c_sstoreSetGas;			///< Once per SSTORE operation if the zeroness changes from zero.
-extern u256 const c_sstoreResetGas;			///< Once per SSTORE operation if the zeroness does not change from zero. NOTE: when c_sstoreSetGas does not apply.
-extern u256 const c_sstoreRefundGas;		///< Refunded gas, once per SSTORE operation if the zeroness changes to zero.
-extern u256 const c_jumpdestGas;			///< Once per JUMPDEST operation.
-extern u256 const c_logGas;					///< Per LOG* operation.
-extern u256 const c_logDataGas;				///< Per byte in a LOG* operation's data.
-extern u256 const c_logTopicGas;			///< Multiplied by the * of the LOG*, per LOG transaction. e.g. LOG0 incurs 0 * c_txLogTopicGas, LOG4 incurs 4 * c_txLogTopicGas.
-extern u256 const c_createGas;				///< Once per CREATE operation & contract-creation transaction.
-extern u256 const c_createDataGas;
-extern u256 const c_callGas;				///< Once per CALL operation & message call transaction.
-extern u256 const c_callStipend;			///< Free gas given at beginning of call.
-extern u256 const c_callNewAccountGas;		///< Paid for CALL when the destination address didn't exist prior.
-extern u256 const c_callValueTransferGas;	///< Paid for CALL when the value transfor is non-zero.
-extern u256 const c_suicideRefundGas;		///< Refunded following a suicide operation.
-extern u256 const c_memoryGas;				///< Times the address of the (highest referenced byte in memory + 1). NOTE: referencing happens on read, write and in instructions such as RETURN and CALL.
-extern u256 const c_quadCoeffDiv;			///< Divisor for the quadratic particle of the memory cost equation.
-extern u256 const c_txGas;					///< Per transaction. NOTE: Not payable on data of calls between transactions.
-extern u256 const c_txDataZeroGas;			///< Per byte of data attached to a transaction that equals zero. NOTE: Not payable on data of calls between transactions.
-extern u256 const c_txDataNonZeroGas;		///< Per byte of data attached to a transaction that is not equal to zero. NOTE: Not payable on data of calls between transactions.
-extern u256 const c_ecrecoverGas;
-extern u256 const c_sha256Gas;
-extern u256 const c_sha256WordGas;
-extern u256 const c_ripemd160Gas;
-extern u256 const c_ripemd160WordGas;
-extern u256 const c_identityGas;
-extern u256 const c_identityWordGas;
 
 }
 }

libethereum/BlockChain.cpp

@@ -37,6 +37,7 @@
 #include <libethcore/Exceptions.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/BlockInfo.h>
+#include <libethcore/Params.h>
 #include <liblll/Compiler.h>
 #include "GenesisInfo.h"
 #include "State.h"
@@ -47,7 +48,7 @@ using namespace dev::eth;
 namespace js = json_spirit;
 
 #define ETH_CATCH 1
-#define ETH_TIMED_IMPORTS 1
+#define ETH_TIMED_IMPORTS 0
 
 #ifdef _WIN32
 const char* BlockChainDebug::name() { return EthBlue "8" EthWhite " <>"; }
@@ -767,7 +768,7 @@ void BlockChain::noteUsed(h256 const& _h, unsigned _extra) const
 		m_inUse.insert(id);
 }
 
-template <class T> static unsigned getHashSize(map<h256, T> const& _map)
+template <class T> static unsigned getHashSize(unordered_map<h256, T> const& _map)
 {
 	unsigned ret = 0;
 	for (auto const& i: _map)
@@ -855,7 +856,7 @@ void BlockChain::garbageCollect(bool _force)
 		}
 	}
 	m_cacheUsage.pop_back();
-	m_cacheUsage.push_front(std::set<CacheID>{});
+	m_cacheUsage.push_front(std::unordered_set<CacheID>{});
 }
 
 void BlockChain::checkConsistency()

libethereum/BlockChain.h

@@ -28,6 +28,8 @@
 
 #include <deque>
 #include <chrono>
+#include <unordered_map>
+#include <unordered_set>
 #include <libdevcore/Log.h>
 #include <libdevcore/Exceptions.h>
 #include <libdevcore/Guards.h>
@@ -40,6 +42,14 @@
 #include "BlockQueue.h"
 namespace ldb = leveldb;
 
+namespace std
+{
+template <> struct hash<pair<dev::h256, unsigned>>
+{
+	size_t operator()(pair<dev::h256, unsigned> const& _x) const { return hash<dev::h256>()(_x.first) ^ hash<unsigned>()(_x.second); }
+};
+}
+
 namespace dev
 {
 
@@ -66,7 +76,7 @@ std::map<Address, Account> const& genesisState();
 
 ldb::Slice toSlice(h256 const& _h, unsigned _sub = 0);
 
-using BlocksHash = std::map<h256, bytes>;
+using BlocksHash = std::unordered_map<h256, bytes>;
 using TransactionHashes = h256s;
 using UncleHashes = h256s;
 using ImportRoute = std::pair<h256s, h256s>;
@@ -144,7 +154,7 @@ public:
 	UncleHashes uncleHashes() const { return uncleHashes(currentHash()); }
 	
 	/// Get the hash for a given block's number.
-	h256 numberHash(unsigned _i) const { if (!_i) return genesisHash(); return queryExtras<BlockHash, ExtraBlockHash>(h256(u256(_i)), m_blockHashes, x_blockHashes, NullBlockHash).value; }
+	h256 numberHash(unsigned _i) const { if (!_i) return genesisHash(); return queryExtras<BlockHash, ExtraBlockHash>(h256(_i), m_blockHashes, x_blockHashes, NullBlockHash).value; }
 
 	/// Get the last N hashes for a given block. (N is determined by the LastHashes type.)
 	LastHashes lastHashes() const { return lastHashes(number()); }
@@ -251,7 +261,7 @@ private:
 	void open(std::string const& _path, WithExisting _we = WithExisting::Trust);
 	void close();
 
-	template<class T, unsigned N> T queryExtras(h256 const& _h, std::map<h256, T>& _m, boost::shared_mutex& _x, T const& _n, ldb::DB* _extrasDB = nullptr) const
+	template<class T, unsigned N> T queryExtras(h256 const& _h, std::unordered_map<h256, T>& _m, boost::shared_mutex& _x, T const& _n, ldb::DB* _extrasDB = nullptr) const
 	{
 		{
 			ReadGuard l(_x);
@@ -295,8 +305,8 @@ private:
 
 	using CacheID = std::pair<h256, unsigned>;
 	mutable Mutex x_cacheUsage;
-	mutable std::deque<std::set<CacheID>> m_cacheUsage;
+	mutable std::deque<std::unordered_set<CacheID>> m_cacheUsage;
-	mutable std::set<CacheID> m_inUse;
+	mutable std::unordered_set<CacheID> m_inUse;
 	void noteUsed(h256 const& _h, unsigned _extra = (unsigned)-1) const;
 	std::chrono::system_clock::time_point m_lastCollection;
 

libethereum/BlockDetails.h

@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include <unordered_map>
 #pragma warning(push)
 #pragma warning(disable: 4100 4267)
 #include <leveldb/db.h>
@@ -114,12 +115,12 @@ struct TransactionAddress
 	static const unsigned size = 67;
 };
 
-using BlockDetailsHash = std::map<h256, BlockDetails>;
+using BlockDetailsHash = std::unordered_map<h256, BlockDetails>;
-using BlockLogBloomsHash = std::map<h256, BlockLogBlooms>;
+using BlockLogBloomsHash = std::unordered_map<h256, BlockLogBlooms>;
-using BlockReceiptsHash = std::map<h256, BlockReceipts>;
+using BlockReceiptsHash = std::unordered_map<h256, BlockReceipts>;
-using TransactionAddressHash = std::map<h256, TransactionAddress>;
+using TransactionAddressHash = std::unordered_map<h256, TransactionAddress>;
-using BlockHashHash = std::map<h256, BlockHash>;
+using BlockHashHash = std::unordered_map<h256, BlockHash>;
-using BlocksBloomsHash = std::map<h256, BlocksBlooms>;
+using BlocksBloomsHash = std::unordered_map<h256, BlocksBlooms>;
 
 static const BlockDetails NullBlockDetails;
 static const BlockLogBlooms NullBlockLogBlooms;

libethereum/CanonBlockChain.cpp

@@ -29,6 +29,7 @@
 #include <libethcore/Exceptions.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/BlockInfo.h>
+#include <libethcore/Params.h>
 #include <liblll/Compiler.h>
 #include "GenesisInfo.h"
 #include "State.h"

libethereum/Client.cpp

@@ -36,12 +36,6 @@ using namespace dev;
 using namespace dev::eth;
 using namespace p2p;
 
-namespace dev
-{
-struct TimerHelper { TimerHelper(char const* _id): id(_id) {} ~TimerHelper() { cdebug << "Timer" << id << t.elapsed() << "s"; } boost::timer t; char const* id; };
-#define DEV_TIMED(S) for (::std::pair<::dev::TimerHelper, bool> __eth_t(#S, true); __eth_t.second; __eth_t.second = false)
-}
-
 VersionChecker::VersionChecker(string const& _dbPath):
 	m_path(_dbPath.size() ? _dbPath : Defaults::dbPath())
 {
@@ -586,7 +580,9 @@ void Client::onChainChanged(ImportRoute const& _ir)
 			for (auto const& t: m_postMine.pending())
 			{
 				clog(ClientNote) << "Resubmitting post-mine transaction " << t;
-				m_tq.import(t, TransactionQueue::ImportCallback(), IfDropped::Retry);
+				auto ir = m_tq.import(t, TransactionQueue::ImportCallback(), IfDropped::Retry);
+				if (ir != ImportResult::Success)
+					onTransactionQueueReady();
 			}
 		ETH_READ_GUARDED(x_working) DEV_TIMED(post) ETH_WRITE_GUARDED(x_postMine)
 			m_postMine = m_working;
@@ -596,6 +592,10 @@ void Client::onChainChanged(ImportRoute const& _ir)
 		onPostStateChanged();
 	}
 
+	// Quick hack for now - the TQ at this point already has the prior pending transactions in it;
+	// we should resync with it manually until we are stricter about what constitutes "knowing".
+	onTransactionQueueReady();
+
 	noteChanged(changeds);
 }
 

libethereum/ClientBase.cpp

@@ -142,6 +142,11 @@ bytes ClientBase::codeAt(Address _a, BlockNumber _block) const
 	return asOf(_block).code(_a);
 }
 
+h256 ClientBase::codeHashAt(Address _a, BlockNumber _block) const
+{
+	return asOf(_block).codeHash(_a);
+}
+
 map<u256, u256> ClientBase::storageAt(Address _a, BlockNumber _block) const
 {
 	return asOf(_block).storage(_a);

libethereum/ClientBase.h

@@ -92,12 +92,14 @@ public:
 	using Interface::countAt;
 	using Interface::stateAt;
 	using Interface::codeAt;
+	using Interface::codeHashAt;
 	using Interface::storageAt;
 
 	virtual u256 balanceAt(Address _a, BlockNumber _block) const override;
 	virtual u256 countAt(Address _a, BlockNumber _block) const override;
 	virtual u256 stateAt(Address _a, u256 _l, BlockNumber _block) const override;
 	virtual bytes codeAt(Address _a, BlockNumber _block) const override;
+	virtual h256 codeHashAt(Address _a, BlockNumber _block) const override;
 	virtual std::map<u256, u256> storageAt(Address _a, BlockNumber _block) const override;
 
 	virtual LocalisedLogEntries logs(unsigned _watchId) const override;

libethereum/DownloadMan.cpp

@@ -50,7 +50,7 @@ h256Set DownloadSub::nextFetch(unsigned _n)
 	m_indices.clear();
 	m_remaining.clear();
 
-	if (!m_man || m_man->chain().empty())
+	if (!m_man || m_man->chainEmpty())
 		return h256Set();
 
 	m_asked = (~(m_man->taken() + m_attempted)).lowest(_n);

libethereum/DownloadMan.h

@@ -143,7 +143,8 @@ public:
 		return ret;
 	}
 
-	h256s chain() const { ReadGuard l(m_lock); return m_chain; }
+	size_t chainSize() const { ReadGuard l(m_lock); return m_chain.size(); }
+	size_t chainEmpty() const { ReadGuard l(m_lock); return m_chain.empty(); }
 	void foreachSub(std::function<void(DownloadSub const&)> const& _f) const { ReadGuard l(x_subs); for(auto i: m_subs) _f(*i); }
 	unsigned subCount() const { ReadGuard l(x_subs); return m_subs.size(); }
 	RangeMask<unsigned> blocksGot() const { ReadGuard l(m_lock); return m_blocksGot; }

libethereum/EthereumHost.cpp

@@ -122,7 +122,7 @@ void EthereumHost::noteDoneBlocks(EthereumPeer* _who, bool _clemency)
 		// Done our chain-get.
 		clog(NetNote) << "Chain download complete.";
 		// 1/100th for each useful block hash.
-		_who->addRating(m_man.chain().size() / 100);
+		_who->addRating(m_man.chainSize() / 100);
 		m_man.reset();
 	}
 	else if (_who->isSyncing())

libethereum/EthereumPeer.cpp

@@ -329,9 +329,10 @@ bool EthereumPeer::interpret(unsigned _id, RLP const& _r)
 	case GetTransactionsPacket: break;	// DEPRECATED.
 	case TransactionsPacket:
 	{
-		clog(NetAllDetail) << "Transactions (" << dec << _r.itemCount() << "entries)";
+		unsigned itemCount = _r.itemCount();
+		clog(NetAllDetail) << "Transactions (" << dec << itemCount << "entries)";
 		Guard l(x_knownTransactions);
-		for (unsigned i = 0; i < _r.itemCount(); ++i)
+		for (unsigned i = 0; i < itemCount; ++i)
 		{
 			auto h = sha3(_r[i].data());
 			m_knownTransactions.insert(h);
@@ -373,21 +374,22 @@ bool EthereumPeer::interpret(unsigned _id, RLP const& _r)
 	}
 	case BlockHashesPacket:
 	{
-		clog(NetMessageSummary) << "BlockHashes (" << dec << _r.itemCount() << "entries)" << (_r.itemCount() ? "" : ": NoMoreHashes");
+		unsigned itemCount = _r.itemCount();
+		clog(NetMessageSummary) << "BlockHashes (" << dec << itemCount << "entries)" << (itemCount ? "" : ": NoMoreHashes");
 
 		if (m_asking != Asking::Hashes)
 		{
 			cwarn << "Peer giving us hashes when we didn't ask for them.";
 			break;
 		}
-		if (_r.itemCount() == 0)
+		if (itemCount == 0)
 		{
 			transition(Asking::Blocks);
 			return true;
 		}
 		unsigned knowns = 0;
 		unsigned unknowns = 0;
-		for (unsigned i = 0; i < _r.itemCount(); ++i)
+		for (unsigned i = 0; i < itemCount; ++i)
 		{
 			addRating(1);
 			auto h = _r[i].toHash<h256>();
@@ -454,12 +456,13 @@ bool EthereumPeer::interpret(unsigned _id, RLP const& _r)
 	}
 	case BlocksPacket:
 	{
-		clog(NetMessageSummary) << "Blocks (" << dec << _r.itemCount() << "entries)" << (_r.itemCount() ? "" : ": NoMoreBlocks");
+		unsigned itemCount = _r.itemCount();
+		clog(NetMessageSummary) << "Blocks (" << dec << itemCount << "entries)" << (itemCount ? "" : ": NoMoreBlocks");
 
 		if (m_asking != Asking::Blocks)
 			clog(NetWarn) << "Unexpected Blocks received!";
 
-		if (_r.itemCount() == 0)
+		if (itemCount == 0)
 		{
 			// Got to this peer's latest block - just give up.
 			transition(Asking::Nothing);
@@ -472,7 +475,7 @@ bool EthereumPeer::interpret(unsigned _id, RLP const& _r)
 		unsigned got = 0;
 		unsigned repeated = 0;
 
-		for (unsigned i = 0; i < _r.itemCount(); ++i)
+		for (unsigned i = 0; i < itemCount; ++i)
 		{
 			auto h = BlockInfo::headerHash(_r[i].data());
 			if (m_sub.noteBlock(h))

libethereum/Interface.h

@@ -25,7 +25,6 @@
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/Guards.h>
 #include <libdevcrypto/Common.h>
-#include <libethcore/Params.h>
 #include <libethcore/ProofOfWork.h>
 #include "LogFilter.h"
 #include "Transaction.h"
@@ -100,12 +99,14 @@ public:
 	u256 countAt(Address _a) const { return countAt(_a, m_default); }
 	u256 stateAt(Address _a, u256 _l) const { return stateAt(_a, _l, m_default); }
 	bytes codeAt(Address _a) const { return codeAt(_a, m_default); }
+	h256 codeHashAt(Address _a) const { return codeHashAt(_a, m_default); }
 	std::map<u256, u256> storageAt(Address _a) const { return storageAt(_a, m_default); }
 
 	virtual u256 balanceAt(Address _a, BlockNumber _block) const = 0;
 	virtual u256 countAt(Address _a, BlockNumber _block) const = 0;
 	virtual u256 stateAt(Address _a, u256 _l, BlockNumber _block) const = 0;
 	virtual bytes codeAt(Address _a, BlockNumber _block) const = 0;
+	virtual h256 codeHashAt(Address _a, BlockNumber _block) const = 0;
 	virtual std::map<u256, u256> storageAt(Address _a, BlockNumber _block) const = 0;
 
 	// [LOGS API]

libethereum/Precompiled.cpp

@@ -24,7 +24,7 @@
 #include <libdevcrypto/SHA3.h>
 #include <libdevcrypto/Common.h>
 #include <libethcore/Common.h>
-#include <libethcore/Params.h>
+#include <libevmcore/Params.h>
 using namespace std;
 using namespace dev;
 using namespace dev::eth;

libethereum/State.h

@@ -31,7 +31,6 @@
 #include <libethcore/BlockInfo.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/Miner.h>
-#include <libethcore/Params.h>
 #include <libevm/ExtVMFace.h>
 #include "TransactionQueue.h"
 #include "Account.h"

libethereum/Transaction.h

@@ -24,7 +24,7 @@
 #include <libdevcore/RLP.h>
 #include <libdevcrypto/SHA3.h>
 #include <libethcore/Common.h>
-#include <libethcore/Params.h>
+#include <libevmcore/Params.h>
 namespace dev
 {
 namespace eth

libethereum/TransactionQueue.cpp

@@ -36,7 +36,6 @@ ImportResult TransactionQueue::import(bytesConstRef _transactionRLP, ImportCallb
 	h256 h = sha3(_transactionRLP);
 
 	UpgradableGuard l(m_lock);
-	// TODO: keep old transactions around and check in State for nonce validity
 
 	auto ir = check_WITH_LOCK(h, _ik);
 	if (ir != ImportResult::Success)

libevm/VM.h

@@ -27,7 +27,7 @@
 #include <libevmcore/Instruction.h>
 #include <libdevcrypto/SHA3.h>
 #include <libethcore/BlockInfo.h>
-#include <libethcore/Params.h>
+#include <libevmcore/Params.h>
 #include "VMFace.h"
 
 namespace dev

libevmcore/Assembly.cpp → libevmasm/Assembly.cpp

@@ -22,8 +22,8 @@
 #include "Assembly.h"
 #include <fstream>
 #include <libdevcore/Log.h>
-#include <libevmcore/CommonSubexpressionEliminator.h>
+#include <libevmasm/CommonSubexpressionEliminator.h>
-#include <libevmcore/ControlFlowGraph.h>
+#include <libevmasm/ControlFlowGraph.h>
 #include <json/json.h>
 using namespace std;
 using namespace dev;

libevmcore/Assembly.h → libevmasm/Assembly.h

@@ -25,9 +25,9 @@
 #include <sstream>
 #include <libdevcore/Common.h>
 #include <libdevcore/Assertions.h>
-#include <libevmcore/SourceLocation.h>
 #include <libevmcore/Instruction.h>
-#include <libevmcore/AssemblyItem.h>
+#include <libevmasm/SourceLocation.h>
+#include <libevmasm/AssemblyItem.h>
 #include "Exceptions.h"
 #include <json/json.h>
 

libevmcore/AssemblyItem.h → libevmasm/AssemblyItem.h

@@ -25,8 +25,8 @@
 #include <sstream>
 #include <libdevcore/Common.h>
 #include <libdevcore/Assertions.h>
-#include <libevmcore/SourceLocation.h>
 #include <libevmcore/Instruction.h>
+#include <libevmasm/SourceLocation.h>
 #include "Exceptions.h"
 
 namespace dev

libevmasm/CMakeLists.txt

@@ -0,0 +1,33 @@
+cmake_policy(SET CMP0015 NEW)
+# this policy was introduced in cmake 3.0
+# remove if, once 3.0 will be used on unix
+if (${CMAKE_MAJOR_VERSION} GREATER 2)
+	# old policy do not use MACOSX_RPATH
+	cmake_policy(SET CMP0042 OLD)
+endif()
+set(CMAKE_AUTOMOC OFF)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
+
+aux_source_directory(. SRC_LIST)
+
+include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
+include_directories(BEFORE ..)
+include_directories(${Boost_INCLUDE_DIRS})
+
+set(EXECUTABLE evmasm)
+
+file(GLOB HEADERS "*.h")
+
+if (ETH_STATIC)
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
+else()
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
+endif()
+
+target_link_libraries(${EXECUTABLE} evmcore)
+target_link_libraries(${EXECUTABLE} devcrypto)
+
+install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
+install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
+

libevmcore/CommonSubexpressionEliminator.cpp → libevmasm/CommonSubexpressionEliminator.cpp

@@ -24,8 +24,8 @@
 #include <functional>
 #include <boost/range/adaptor/reversed.hpp>
 #include <libdevcrypto/SHA3.h>
-#include <libevmcore/CommonSubexpressionEliminator.h>
+#include <libevmasm/CommonSubexpressionEliminator.h>
-#include <libevmcore/AssemblyItem.h>
+#include <libevmasm/AssemblyItem.h>
 
 using namespace std;
 using namespace dev;

libevmcore/CommonSubexpressionEliminator.h → libevmasm/CommonSubexpressionEliminator.h

@@ -30,8 +30,8 @@
 #include <ostream>
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/Exceptions.h>
-#include <libevmcore/ExpressionClasses.h>
+#include <libevmasm/ExpressionClasses.h>
-#include <libevmcore/SemanticInformation.h>
+#include <libevmasm/SemanticInformation.h>
 
 namespace dev
 {

libevmcore/ControlFlowGraph.cpp → libevmasm/ControlFlowGraph.cpp

@@ -21,11 +21,11 @@
  * Control flow analysis for the optimizer.
  */
 
-#include <libevmcore/ControlFlowGraph.h>
+#include <libevmasm/ControlFlowGraph.h>
 #include <map>
-#include <libevmcore/Exceptions.h>
+#include <libevmasm/Exceptions.h>
-#include <libevmcore/AssemblyItem.h>
+#include <libevmasm/AssemblyItem.h>
-#include <libevmcore/SemanticInformation.h>
+#include <libevmasm/SemanticInformation.h>
 
 using namespace std;
 using namespace dev;

libevmasm/Exceptions.h

@@ -0,0 +1,36 @@
+/*
+	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 Exceptions.h
+ * @author Christian <c@ethdev.com>
+ * @date 2014
+ */
+
+#pragma once
+
+#include <libdevcore/Exceptions.h>
+
+namespace dev
+{
+namespace eth
+{
+
+struct AssemblyException: virtual Exception {};
+struct OptimizerException: virtual AssemblyException {};
+struct StackTooDeepException: virtual OptimizerException {};
+
+}
+}

libevmcore/ExpressionClasses.cpp → libevmasm/ExpressionClasses.cpp

@@ -21,14 +21,14 @@
  * Container for equivalence classes of expressions for use in common subexpression elimination.
  */
 
-#include <libevmcore/ExpressionClasses.h>
+#include <libevmasm/ExpressionClasses.h>
 #include <utility>
 #include <tuple>
 #include <functional>
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/noncopyable.hpp>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
-#include <libevmcore/CommonSubexpressionEliminator.h>
+#include <libevmasm/CommonSubexpressionEliminator.h>
 
 using namespace std;
 using namespace dev;

libevmcore/ExpressionClasses.h → libevmasm/ExpressionClasses.h

@@ -27,7 +27,7 @@
 #include <map>
 #include <memory>
 #include <libdevcore/Common.h>
-#include <libevmcore/AssemblyItem.h>
+#include <libevmasm/AssemblyItem.h>
 
 namespace dev
 {

libevmcore/SemanticInformation.cpp → libevmasm/SemanticInformation.cpp

@@ -21,8 +21,8 @@
  * Helper to provide semantic information about assembly items.
  */
 
-#include <libevmcore/SemanticInformation.h>
+#include <libevmasm/SemanticInformation.h>
-#include <libevmcore/AssemblyItem.h>
+#include <libevmasm/AssemblyItem.h>
 
 using namespace std;
 using namespace dev;

libevmcore/CMakeLists.txt

@@ -7,11 +7,8 @@ if (${CMAKE_MAJOR_VERSION} GREATER 2)
 endif()
 set(CMAKE_AUTOMOC OFF)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
-
 aux_source_directory(. SRC_LIST)
 
-include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
 include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})
 
@@ -22,7 +19,6 @@ file(GLOB HEADERS "*.h")
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 target_link_libraries(${EXECUTABLE} devcore)
-target_link_libraries(${EXECUTABLE} devcrypto)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

libevmcore/Exceptions.h

@@ -28,11 +28,8 @@ namespace dev
 namespace eth
 {
 
-struct AssemblyException: virtual Exception {};
+struct InvalidDeposit: virtual Exception {};
-struct InvalidDeposit: virtual AssemblyException {};
+struct InvalidOpcode: virtual Exception {};
-struct InvalidOpcode: virtual AssemblyException {};
-struct OptimizerException: virtual AssemblyException {};
-struct StackTooDeepException: virtual OptimizerException {};
 
 }
 }

libevmcore/Params.cpp

@@ -0,0 +1,69 @@
+/*
+	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 Params.cpp
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2014
+ */
+
+#include "Params.h"
+
+using namespace std;
+namespace dev
+{
+namespace eth
+{
+
+//--- BEGIN: AUTOGENERATED FROM github.com/ethereum/common/params.json
+u256 const c_stackLimit = 1024;
+u256 const c_tierStepGas[] = {0, 2, 3, 5, 8, 10, 20, 0};
+u256 const c_expGas = 10;
+u256 const c_expByteGas = 10;
+u256 const c_sha3Gas = 30;
+u256 const c_sha3WordGas = 6;
+u256 const c_sloadGas = 50;
+u256 const c_sstoreSetGas = 20000;
+u256 const c_sstoreResetGas = 5000;
+u256 const c_sstoreRefundGas = 15000;
+u256 const c_jumpdestGas = 1;
+u256 const c_logGas = 375;
+u256 const c_logDataGas = 8;
+u256 const c_logTopicGas = 375;
+u256 const c_createGas = 32000;
+u256 const c_callGas = 40;
+u256 const c_callStipend = 2300;
+u256 const c_callValueTransferGas = 9000;
+u256 const c_callNewAccountGas = 25000;
+u256 const c_suicideRefundGas = 24000;
+u256 const c_memoryGas = 3;
+u256 const c_quadCoeffDiv = 512;
+u256 const c_createDataGas = 200;
+u256 const c_txGas = 21000;
+u256 const c_txDataZeroGas = 4;
+u256 const c_txDataNonZeroGas = 68;
+u256 const c_copyGas = 3;
+u256 const c_ecrecoverGas = 3000;
+u256 const c_sha256Gas = 60;
+u256 const c_sha256WordGas = 12;
+u256 const c_ripemd160Gas = 600;
+u256 const c_ripemd160WordGas = 120;
+u256 const c_identityGas = 15;
+u256 const c_identityWordGas = 3;
+//--- END: AUTOGENERATED FROM /feeStructure.json
+
+}
+}
+

libevmcore/Params.h

@@ -0,0 +1,69 @@
+/*
+	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 Params.h
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2014
+ */
+
+#pragma once
+
+#include <libdevcore/Common.h>
+
+namespace dev
+{
+namespace eth
+{
+
+//--- BEGIN: AUTOGENERATED FROM /feeStructure.json
+extern u256 const c_stackLimit;
+
+extern u256 const c_tierStepGas[8];			///< Once per operation, for a selection of them.
+extern u256 const c_expGas;					///< Once per EXP instuction.
+extern u256 const c_expByteGas;				///< Times ceil(log256(exponent)) for the EXP instruction.
+extern u256 const c_sha3Gas;				///< Once per SHA3 operation.
+extern u256 const c_sha3WordGas;			///< Once per word of the SHA3 operation's data.
+extern u256 const c_copyGas;				///< Multiplied by the number of 32-byte words that are copied (round up) for any *COPY operation and added.
+extern u256 const c_sloadGas;				///< Once per SLOAD operation.
+extern u256 const c_sstoreSetGas;			///< Once per SSTORE operation if the zeroness changes from zero.
+extern u256 const c_sstoreResetGas;			///< Once per SSTORE operation if the zeroness does not change from zero. NOTE: when c_sstoreSetGas does not apply.
+extern u256 const c_sstoreRefundGas;		///< Refunded gas, once per SSTORE operation if the zeroness changes to zero.
+extern u256 const c_jumpdestGas;			///< Once per JUMPDEST operation.
+extern u256 const c_logGas;					///< Per LOG* operation.
+extern u256 const c_logDataGas;				///< Per byte in a LOG* operation's data.
+extern u256 const c_logTopicGas;			///< Multiplied by the * of the LOG*, per LOG transaction. e.g. LOG0 incurs 0 * c_txLogTopicGas, LOG4 incurs 4 * c_txLogTopicGas.
+extern u256 const c_createGas;				///< Once per CREATE operation & contract-creation transaction.
+extern u256 const c_createDataGas;
+extern u256 const c_callGas;				///< Once per CALL operation & message call transaction.
+extern u256 const c_callStipend;			///< Free gas given at beginning of call.
+extern u256 const c_callNewAccountGas;		///< Paid for CALL when the destination address didn't exist prior.
+extern u256 const c_callValueTransferGas;	///< Paid for CALL when the value transfor is non-zero.
+extern u256 const c_suicideRefundGas;		///< Refunded following a suicide operation.
+extern u256 const c_memoryGas;				///< Times the address of the (highest referenced byte in memory + 1). NOTE: referencing happens on read, write and in instructions such as RETURN and CALL.
+extern u256 const c_quadCoeffDiv;			///< Divisor for the quadratic particle of the memory cost equation.
+extern u256 const c_txGas;					///< Per transaction. NOTE: Not payable on data of calls between transactions.
+extern u256 const c_txDataZeroGas;			///< Per byte of data attached to a transaction that equals zero. NOTE: Not payable on data of calls between transactions.
+extern u256 const c_txDataNonZeroGas;		///< Per byte of data attached to a transaction that is not equal to zero. NOTE: Not payable on data of calls between transactions.
+extern u256 const c_ecrecoverGas;
+extern u256 const c_sha256Gas;
+extern u256 const c_sha256WordGas;
+extern u256 const c_ripemd160Gas;
+extern u256 const c_ripemd160WordGas;
+extern u256 const c_identityGas;
+extern u256 const c_identityWordGas;
+
+}
+}

libjsqrc/setup.js

@@ -21,5 +21,5 @@
  */
 
 var web3 = require('web3');
-web3.setProvider(new web3.providers.HttpProvider("http://localhost:8080"));
+web3.setProvider(new web3.providers.HttpProvider("http://localhost:8545"));
 

liblll/CMakeLists.txt

@@ -21,8 +21,7 @@ file(GLOB HEADERS "*.h")
 
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-target_link_libraries(${EXECUTABLE} evmcore)
+target_link_libraries(${EXECUTABLE} evmasm)
-target_link_libraries(${EXECUTABLE} devcore)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

liblll/CodeFragment.h

@@ -23,7 +23,7 @@
 
 #include <libdevcore/Common.h>
 #include <libevmcore/Instruction.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
 #include "Exceptions.h"
 
 namespace boost { namespace spirit { class utree; } }

libp2p/Host.cpp

@@ -464,7 +464,7 @@ void Host::connect(std::shared_ptr<Peer> const& _p)
 		return;
 	}
 
-	if (!m_nodeTable->haveNode(_p->id))
+	if (!!m_nodeTable && !m_nodeTable->haveNode(_p->id))
 	{
 		clog(NetWarn) << "Aborted connect. Node not in node table.";
 		m_nodeTable->addNode(*_p.get());

libsolidity/AST.h

@@ -27,7 +27,7 @@
 #include <vector>
 #include <memory>
 #include <boost/noncopyable.hpp>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 #include <libsolidity/Utils.h>
 #include <libsolidity/ASTForward.h>
 #include <libsolidity/Token.h>

libsolidity/ASTUtils.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 #include <libsolidity/ASTVisitor.h>
 
 namespace dev

libsolidity/CMakeLists.txt

@@ -22,7 +22,7 @@ file(GLOB HEADERS "*.h")
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
-target_link_libraries(${EXECUTABLE} evmcore)
+target_link_libraries(${EXECUTABLE} evmasm)
 target_link_libraries(${EXECUTABLE} devcrypto)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )

libsolidity/Compiler.cpp

@@ -24,7 +24,7 @@
 #include <algorithm>
 #include <boost/range/adaptor/reversed.hpp>
 #include <libevmcore/Instruction.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
 #include <libsolidity/AST.h>
 #include <libsolidity/ExpressionCompiler.h>
 #include <libsolidity/CompilerUtils.h>

libsolidity/Compiler.h

@@ -26,7 +26,7 @@
 #include <functional>
 #include <libsolidity/ASTVisitor.h>
 #include <libsolidity/CompilerContext.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
 
 namespace dev {
 namespace solidity {

libsolidity/CompilerContext.h

@@ -26,7 +26,7 @@
 #include <stack>
 #include <utility>
 #include <libevmcore/Instruction.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
 #include <libsolidity/ASTForward.h>
 #include <libsolidity/Types.h>
 #include <libdevcore/Common.h>

libsolidity/Exceptions.h

@@ -25,7 +25,7 @@
 #include <string>
 #include <utility>
 #include <libdevcore/Exceptions.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 
 namespace dev
 {

libsolidity/ExpressionCompiler.h

@@ -25,7 +25,7 @@
 #include <memory>
 #include <boost/noncopyable.hpp>
 #include <libdevcore/Common.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 #include <libsolidity/Utils.h>
 #include <libsolidity/ASTVisitor.h>
 #include <libsolidity/LValue.h>

libsolidity/LValue.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <memory>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 #include <libsolidity/ArrayUtils.h>
 
 namespace dev

libsolidity/Parser.cpp

@@ -22,7 +22,7 @@
 
 #include <vector>
 #include <libdevcore/Log.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 #include <libsolidity/Parser.h>
 #include <libsolidity/Scanner.h>
 #include <libsolidity/Exceptions.h>

libsolidity/Scanner.h

@@ -55,7 +55,7 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/CommonData.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 #include <libsolidity/Token.h>
 
 namespace dev

libsolidity/SourceReferenceFormatter.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <ostream>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 
 namespace dev
 {

mix/CodeModel.cpp

@@ -26,7 +26,7 @@
 #include <QApplication>
 #include <QtQml>
 #include <libdevcore/Common.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 #include <libsolidity/AST.h>
 #include <libsolidity/Types.h>
 #include <libsolidity/ASTVisitor.h>

mix/CodeModel.h

@@ -30,7 +30,7 @@
 #include <QHash>
 #include <libdevcore/Common.h>
 #include <libdevcore/Guards.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
 #include "SolidityType.h"
 
 class QTextDocument;

mix/MixClient.cpp

@@ -28,6 +28,7 @@
 #include <libethereum/Executive.h>
 #include <libethereum/ExtVM.h>
 #include <libethereum/BlockChain.h>
+#include <libethcore/Params.h>
 #include <libevm/VM.h>
 #include "Exceptions.h"
 using namespace std;

mix/QBasicNodeDefinition.h

@@ -23,7 +23,7 @@
 
 #include <string>
 #include <QObject>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 
 namespace dev
 {

solc/CommandLineInterface.cpp

@@ -175,6 +175,9 @@ void CommandLineInterface::handleBytecode(string const& _contract)
 
 void CommandLineInterface::handleSignatureHashes(string const& _contract)
 {
+	if (!m_args.count(g_argSignatureHashes))
+		return;
+
 	string out;
 	for (auto const& it: m_compiler->getContractDefinition(_contract).getInterfaceFunctions())
 		out += toHex(it.first.ref()) + ": " + it.second->externalSignature() + "\n";

test/libp2p/peer.cpp

@@ -118,6 +118,61 @@ BOOST_AUTO_TEST_CASE(save_nodes)
 
 BOOST_AUTO_TEST_SUITE_END()
 
+BOOST_FIXTURE_TEST_SUITE(p2pPeer, P2PFixture)
+
+BOOST_AUTO_TEST_CASE(requirePeer)
+{
+	auto oldLogVerbosity = g_logVerbosity;
+	g_logVerbosity = 10;
+
+	const char* const localhost = "127.0.0.1";
+	NetworkPreferences prefs1(localhost, 30301, false);
+	NetworkPreferences prefs2(localhost, 30302, false);
+	Host host1("Test", prefs1);
+	host1.start();
+
+	Host host2("Test", prefs2);
+	host2.start();
+
+	auto node2 = host2.id();
+	host1.requirePeer(node2, NodeIPEndpoint(bi::address::from_string(localhost), prefs2.listenPort, prefs2.listenPort));
+
+	this_thread::sleep_for(chrono::seconds(3));
+
+	auto host1peerCount = host1.peerCount();
+	auto host2peerCount = host2.peerCount();
+	BOOST_REQUIRE_EQUAL(host1peerCount, 1);
+	BOOST_REQUIRE_EQUAL(host2peerCount, 1);
+
+	PeerSessionInfos sis1 = host1.peerSessionInfo();
+	PeerSessionInfos sis2 = host2.peerSessionInfo();
+
+	BOOST_REQUIRE_EQUAL(sis1.size(), 1);
+	BOOST_REQUIRE_EQUAL(sis2.size(), 1);
+
+	Peers peers1 = host1.getPeers();
+	Peers peers2 = host2.getPeers();
+	BOOST_REQUIRE_EQUAL(peers1.size(), 1);
+	BOOST_REQUIRE_EQUAL(peers2.size(), 1);
+
+	DisconnectReason disconnect1 = peers1[0].lastDisconnect();
+	DisconnectReason disconnect2 = peers2[0].lastDisconnect();
+	BOOST_REQUIRE_EQUAL(disconnect1, disconnect2);
+
+	host1.relinquishPeer(node2);
+
+	this_thread::sleep_for(chrono::seconds(1));
+
+	host1peerCount = host1.peerCount();
+	host2peerCount = host2.peerCount();
+	BOOST_REQUIRE_EQUAL(host1peerCount, 1);
+	BOOST_REQUIRE_EQUAL(host2peerCount, 1);
+
+	g_logVerbosity = oldLogVerbosity;
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
 BOOST_AUTO_TEST_SUITE(peerTypes)
 
 BOOST_AUTO_TEST_CASE(emptySharedPeer)

test/libsolidity/Assembly.cpp

@@ -17,20 +17,20 @@
 /**
  * @author Lefteris Karapetsas <lefteris@ethdev.com>
  * @date 2015
- * Unit tests for Assembly Items from evmcore/Assembly.h
+ * Unit tests for Assembly Items from evmasm/Assembly.h
  */
 
 #include <string>
 #include <iostream>
 #include <boost/test/unit_test.hpp>
 #include <libdevcore/Log.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
+#include <libevmasm/Assembly.h>
 #include <libsolidity/Scanner.h>
 #include <libsolidity/Parser.h>
 #include <libsolidity/NameAndTypeResolver.h>
 #include <libsolidity/Compiler.h>
 #include <libsolidity/AST.h>
-#include <libevmcore/Assembly.h>
 
 using namespace std;
 using namespace dev::eth;

test/libsolidity/SolidityOptimizer.cpp

@@ -26,9 +26,9 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/lexical_cast.hpp>
 #include <test/libsolidity/solidityExecutionFramework.h>
-#include <libevmcore/CommonSubexpressionEliminator.h>
+#include <libevmasm/CommonSubexpressionEliminator.h>
-#include <libevmcore/ControlFlowGraph.h>
+#include <libevmasm/ControlFlowGraph.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
 
 using namespace std;
 using namespace dev::eth;