Optimisations QString -> string, make AZ snappier by refactoring UI of

accounts.

alethzero/Context.h

@@ -59,10 +59,10 @@ class Context
 public:
 	virtual ~Context();
 
-	virtual QString pretty(dev::Address _a) const = 0;
-	virtual QString prettyU256(dev::u256 _n) const = 0;
-	virtual QString render(dev::Address _a) const = 0;
-	virtual std::pair<dev::Address, dev::bytes> fromString(QString const& _a) const = 0;
+	virtual std::string pretty(dev::Address const& _a) const = 0;
+	virtual std::string prettyU256(dev::u256 const& _n) const = 0;
+	virtual std::pair<dev::Address, dev::bytes> fromString(std::string 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/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);
-		(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))
+		string r = m_main->render(i);
+		(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>
@@ -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>
@@ -595,13 +557,16 @@
     <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>

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 QString::fromStdString(s);
+				return string();
+		return s;
 	}
-	return QString();
+	return string();
 }
 
 QString contentsOfQResource(string const& res)
@@ -398,7 +398,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 +410,7 @@ void Main::onNewPending()
 
 	// update any pending-transaction dependent views.
 	refreshPending();
-	refreshAccounts();
+	ui->refreshAccounts->setEnabled(true);
 }
 
 void Main::on_forceMining_triggered()
@@ -510,33 +510,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)));
-		if (s.size())
-			return s;
+		string n = toString(abiOut<string32>(ethereum()->call(g_newNameReg, abiIn("name(address)", _a)).output));
+		if (!n.empty())
+			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);
-	QString n;
-	try {
-		n = QString::fromStdString(ICAP(_a).encoded());
-	}
-	catch (...) {
-		n = QString::fromStdString(_a.abridged());
-	}
-	return p.isEmpty() ? n : (p + " " + n);
+	string p = pretty(_a);
+	string n;
+	if (p.size() == 9 && p.find_first_not_of("QWERYUOPASDFGHJKLZXCVBNM1234567890") == string::npos)
+		p = ICAP(p, "XREG").encoded();
+	else
+		DEV_IGNORE_EXCEPTIONS(n = ICAP(_a).encoded());
+	if (n.empty())
+		n = _a.abridged();
+	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 +544,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 +552,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 +568,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 +600,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 +817,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 +936,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;
 
@@ -994,7 +994,7 @@ void Main::refreshAll()
 	refreshBlockChain();
 	refreshBlockCount();
 	refreshPending();
-	refreshAccounts();
+	ui->refreshAccounts->setEnabled(true);
 	refreshBalances();
 }
 
@@ -1007,40 +1007,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(render(t.receiveAddress()))
+				.arg(QString::fromStdString(render(t.safeSender())))
+				.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(render(right160(sha3(rlpList(t.safeSender(), t.nonce())))))
+				.arg(QString::fromStdString(render(t.safeSender())))
+				.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();
-	for (auto n = 0; n < 2; ++n)
-		for (auto i: ethereum()->addresses())
-		{
-			auto r = render(i);
-			if (r.contains('(') == !n)
+	bool showContract = ui->showContracts->isChecked();
+	bool showBasic = ui->showBasic->isChecked();
+	bool onlyNamed = ui->onlyNamed->isChecked();
+	for (auto const& i: ethereum()->addresses())
 	{
-				if (n == 0 || ui->showAllAccounts->isChecked())
-					(new QListWidgetItem(QString("%2: %1 [%3]").arg(formatBalance(ethereum()->balanceAt(i)).c_str()).arg(r).arg((unsigned)ethereum()->countAt(i)), ui->accounts))
-						->setData(Qt::UserRole, QByteArray((char const*)i.data(), Address::size));
-				if (ethereum()->codeAt(i).size())
-					(new QListWidgetItem(QString("%2: %1 [%3]").arg(formatBalance(ethereum()->balanceAt(i)).c_str()).arg(r).arg((unsigned)ethereum()->countAt(i)), ui->contracts))
+		bool isContract = (ethereum()->codeHashAt(i) != EmptySHA3);
+		if (!((showContract && isContract) || (showBasic && !isContract)))
+			continue;
+		string r = render(i);
+		if (onlyNamed && !(r.find('"') != string::npos || r.substr(0, 2) == "XE"))
+			continue;
+		(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));
 	}
-		}
 #endif
+	ui->refreshAccounts->setEnabled(false);
 }
 
 void Main::refreshBlockCount()
@@ -1057,6 +1083,7 @@ void Main::on_turboMining_triggered()
 
 void Main::refreshBlockChain()
 {
+	DEV_TIMED_FUNCTION;
 	cwatch << "refreshBlockChain()";
 
 	// TODO: keep the same thing highlighted.
@@ -1105,14 +1132,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(render(t.receiveAddress()))
+						.arg(QString::fromStdString(render(t.safeSender())))
+						.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(render(right160(sha3(rlpList(t.safeSender(), t.nonce())))))
+						.arg(QString::fromStdString(render(t.safeSender())))
+						.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 +1283,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 +1316,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 +1325,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 +1348,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 +1440,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 +1474,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 +1505,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 +1540,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 +1622,10 @@ void Main::debugDumpState(int _add)
 	}
 }
 
-void Main::on_contracts_currentItemChanged()
+void Main::on_accounts_currentItemChanged()
 {
-	ui->contractInfo->clear();
-	if (auto item = ui->contracts->currentItem())
+	ui->accountInfo->clear();
+	if (auto item = ui->accounts->currentItem())
 	{
 		auto hba = item->data(Qt::UserRole).toByteArray();
 		assert(hba.size() == 20);
@@ -1604,16 +1636,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 +1677,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 +1907,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 +1929,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 +1943,17 @@ QString Main::prettyU256(dev::u256 _n) const
 	else if ((_n >> 160) == 0)
 	{
 		Address a = right160(_n);
-		QString n = pretty(a);
-		if (n.isNull())
+		string n = pretty(a);
+		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;
-	QString prettyU256(dev::u256 _n) const override;
-	QString render(dev::Address _a) const override;
-	std::pair<dev::Address, dev::bytes> fromString(QString const& _a) const override;
+	std::string pretty(dev::Address const& _a) const override;
+	std::string prettyU256(dev::u256 const& _n) const override;
+	std::string render(dev::Address 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_contracts_currentItemChanged();
+	void on_accounts_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);

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,21 @@ 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)
+#define DEV_TIMED_FUNCTION DEV_TIMED_SCOPE(__PRETTY_FUNCTION__)
+
 enum class WithExisting: int
 {
 	Trust = 0,

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.

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/Interface.h

@@ -100,12 +100,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/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)

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"));