API change: eth.watches will give you the log entries that are new as an

arg.

alethzero/MainWin.cpp

@@ -244,14 +244,14 @@ void Main::onKeysChanged()
 	installBalancesWatch();
 }
 
-unsigned Main::installWatch(dev::eth::LogFilter const& _tf, std::function<void()> const& _f)
+unsigned Main::installWatch(dev::eth::LogFilter const& _tf, WatchHandler const& _f)
 {
 	auto ret = ethereum()->installWatch(_tf);
 	m_handlers[ret] = _f;
 	return ret;
 }
 
-unsigned Main::installWatch(dev::h256 _tf, std::function<void()> const& _f)
+unsigned Main::installWatch(dev::h256 _tf, WatchHandler const& _f)
 {
 	auto ret = ethereum()->installWatch(_tf);
 	m_handlers[ret] = _f;
@@ -266,10 +266,10 @@ void Main::uninstallWatch(unsigned _w)
 
 void Main::installWatches()
 {
-	installWatch(dev::eth::LogFilter().address(c_newConfig), [=]() { installNameRegWatch(); });
-	installWatch(dev::eth::LogFilter().address(c_newConfig), [=]() { installCurrenciesWatch(); });
-	installWatch(dev::eth::PendingChangedFilter, [=](){ onNewPending(); });
-	installWatch(dev::eth::ChainChangedFilter, [=](){ onNewBlock(); });
+	installWatch(dev::eth::LogFilter().address(c_newConfig), [=](LocalisedLogEntries const&) { installNameRegWatch(); });
+	installWatch(dev::eth::LogFilter().address(c_newConfig), [=](LocalisedLogEntries const&) { installCurrenciesWatch(); });
+	installWatch(dev::eth::PendingChangedFilter, [=](LocalisedLogEntries const&){ onNewPending(); });
+	installWatch(dev::eth::ChainChangedFilter, [=](LocalisedLogEntries const&){ onNewBlock(); });
 }
 
 Address Main::getNameReg() const
@@ -285,13 +285,13 @@ Address Main::getCurrencies() const
 void Main::installNameRegWatch()
 {
 	uninstallWatch(m_nameRegFilter);
-	m_nameRegFilter = installWatch(dev::eth::LogFilter().address((u160)getNameReg()), [=](){ onNameRegChange(); });
+	m_nameRegFilter = installWatch(dev::eth::LogFilter().address((u160)getNameReg()), [=](LocalisedLogEntries const&){ onNameRegChange(); });
 }
 
 void Main::installCurrenciesWatch()
 {
 	uninstallWatch(m_currenciesFilter);
-	m_currenciesFilter = installWatch(dev::eth::LogFilter().address((u160)getCurrencies()), [=](){ onCurrenciesChange(); });
+	m_currenciesFilter = installWatch(dev::eth::LogFilter().address((u160)getCurrencies()), [=](LocalisedLogEntries const&){ onCurrenciesChange(); });
 }
 
 void Main::installBalancesWatch()
@@ -309,7 +309,7 @@ void Main::installBalancesWatch()
 			tf.address(c).topic(h256(i.address(), h256::AlignRight));
 
 	uninstallWatch(m_balancesFilter);
-	m_balancesFilter = installWatch(tf, [=](){ onBalancesChange(); });
+	m_balancesFilter = installWatch(tf, [=](LocalisedLogEntries const&){ onBalancesChange(); });
 }
 
 void Main::onNameRegChange()
@@ -1171,8 +1171,11 @@ void Main::timerEvent(QTimerEvent*)
 		m_qweb->poll();
 
 	for (auto const& i: m_handlers)
-		if (ethereum()->checkWatch(i.first))
-			i.second();
+	{
+		auto ls = ethereum()->checkWatch(i.first);
+		if (ls.size())
+			i.second(ls);
+	}
 }
 
 string Main::renderDiff(dev::eth::StateDiff const& _d) const

alethzero/MainWin.h

@@ -66,6 +66,8 @@ struct WorldState
 	std::vector<WorldState const*> levels;
 };
 
+using WatchHandler = std::function<void(dev::eth::LocalisedLogEntries const&)>;
+
 class Main : public QMainWindow
 {
 	Q_OBJECT
@@ -195,8 +197,8 @@ private:
 	dev::u256 value() const;
 	dev::u256 gasPrice() const;
 
-	unsigned installWatch(dev::eth::LogFilter const& _tf, std::function<void()> const& _f);
-	unsigned installWatch(dev::h256 _tf, std::function<void()> const& _f);
+	unsigned installWatch(dev::eth::LogFilter const& _tf, WatchHandler const& _f);
+	unsigned installWatch(dev::h256 _tf, WatchHandler const& _f);
 	void uninstallWatch(unsigned _w);
 
 	void keysChanged();
@@ -229,7 +231,7 @@ private:
 
 	std::unique_ptr<dev::WebThreeDirect> m_webThree;
 
-	std::map<unsigned, std::function<void()>> m_handlers;
+	std::map<unsigned, WatchHandler> m_handlers;
 	unsigned m_nameRegFilter = (unsigned)-1;
 	unsigned m_currenciesFilter = (unsigned)-1;
 	unsigned m_balancesFilter = (unsigned)-1;

libethereum/Client.cpp

@@ -177,21 +177,29 @@ void Client::clearPending()
 
 unsigned Client::installWatch(h256 _h)
 {
-	auto ret = m_watches.size() ? m_watches.rbegin()->first + 1 : 0;
-	m_watches[ret] = ClientWatch(_h);
-	cwatch << "+++" << ret << _h;
+	unsigned ret;
+	{
+		Guard l(m_filterLock);
+		ret = m_watches.size() ? m_watches.rbegin()->first + 1 : 0;
+		m_watches[ret] = ClientWatch(_h);
+		cwatch << "+++" << ret << _h;
+	}
+	auto ch = logs(ret);
+	{
+		Guard l(m_filterLock);
+		swap(m_watches[ret].changes, ch);
+	}
 	return ret;
 }
 
 unsigned Client::installWatch(LogFilter const& _f)
 {
-	Guard l(m_filterLock);
-
 	h256 h = _f.sha3();
-
-	if (!m_filters.count(h))
-		m_filters.insert(make_pair(h, _f));
-
+	{
+		Guard l(m_filterLock);
+		if (!m_filters.count(h))
+			m_filters.insert(make_pair(h, _f));
+	}
 	return installWatch(h);
 }
 
@@ -216,32 +224,81 @@ void Client::uninstallWatch(unsigned _i)
 void Client::noteChanged(h256Set const& _filters)
 {
 	Guard l(m_filterLock);
+	// accrue all changes left in each filter into the watches.
 	for (auto& i: m_watches)
 		if (_filters.count(i.second.id))
 		{
 //			cwatch << "!!!" << i.first << i.second.id;
-			i.second.changes++;
+			try {
+				i.second.changes += m_filters.at(i.second.id).changes;
+			} catch(...){}
 		}
+	// clear the filters now.
+	for (auto& i: m_filters)
+		i.second.changes.clear();
 }
 
-void Client::appendFromNewPending(LogBloom _bloom, h256Set& o_changed) const
+LocalisedLogEntries Client::peekWatch(unsigned _watchId) const
+{
+	Guard l(m_filterLock);
+
+	try {
+		return m_watches.at(_watchId).changes;
+	} catch (...) {}
+	return LocalisedLogEntries();
+}
+
+LocalisedLogEntries Client::checkWatch(unsigned _watchId)
 {
-	// TODO: more precise check on whether the txs match.
 	Guard l(m_filterLock);
-	for (pair<h256, InstalledFilter> const& i: m_filters)
-		if ((unsigned)i.second.filter.latest() > m_bc.number() && i.second.filter.matches(_bloom))
-			o_changed.insert(i.first);
+	LocalisedLogEntries ret;
+
+	try {
+		std::swap(ret, m_watches.at(_watchId).changes);
+	} catch (...) {}
+
+	return ret;
+}
+
+void Client::appendFromNewPending(TransactionReceipt const& _receipt, h256Set& io_changed)
+{
+	Guard l(m_filterLock);
+	for (pair<h256 const, InstalledFilter>& i: m_filters)
+		if ((unsigned)i.second.filter.latest() > m_bc.number())
+		{
+			// acceptable number.
+			auto m = i.second.filter.matches(_receipt);
+			if (m.size())
+			{
+				// filter catches them
+				for (LogEntry const& l: m)
+					i.second.changes.push_back(LocalisedLogEntry(l, m_bc.number() + 1));
+				io_changed.insert(i.first);
+			}
+		}
 }
 
-void Client::appendFromNewBlock(h256 _block, h256Set& o_changed) const
+void Client::appendFromNewBlock(h256 const& _block, h256Set& io_changed)
 {
 	// TODO: more precise check on whether the txs match.
 	auto d = m_bc.info(_block);
+	auto br = m_bc.receipts(_block);
 
 	Guard l(m_filterLock);
-	for (pair<h256, InstalledFilter> const& i: m_filters)
+	for (pair<h256 const, InstalledFilter>& i: m_filters)
 		if ((unsigned)i.second.filter.latest() >= d.number && (unsigned)i.second.filter.earliest() <= d.number && i.second.filter.matches(d.logBloom))
-			o_changed.insert(i.first);
+			// acceptable number & looks like block may contain a matching log entry.
+			for (TransactionReceipt const& tr: br.receipts)
+			{
+				auto m = i.second.filter.matches(tr);
+				if (m.size())
+				{
+					// filter catches them
+					for (LogEntry const& l: m)
+						i.second.changes.push_back(LocalisedLogEntry(l, (unsigned)d.number));
+					io_changed.insert(i.first);
+				}
+			}
 }
 
 void Client::setForceMining(bool _enable)
@@ -468,10 +525,10 @@ void Client::doWork()
 
 		// returns h256s as blooms, once for each transaction.
 		cwork << "postSTATE <== TQ";
-		h512s newPendingBlooms = m_postMine.sync(m_bc, m_tq);
-		if (newPendingBlooms.size())
+		TransactionReceipts newPendingReceipts = m_postMine.sync(m_bc, m_tq);
+		if (newPendingReceipts.size())
 		{
-			for (auto i: newPendingBlooms)
+			for (auto i: newPendingReceipts)
 				appendFromNewPending(i, changeds);
 			changeds.insert(PendingChangedFilter);
 

libethereum/Client.h

@@ -78,6 +78,7 @@ struct InstalledFilter
 
 	LogFilter filter;
 	unsigned refCount = 1;
+	LocalisedLogEntries changes;
 };
 
 static const h256 PendingChangedFilter = u256(0);
@@ -89,7 +90,7 @@ struct ClientWatch
 	explicit ClientWatch(h256 _id): id(_id) {}
 
 	h256 id;
-	unsigned changes = 1;
+	LocalisedLogEntries changes;
 };
 
 struct WatchChannel: public LogChannel { static const char* name() { return "(o)"; } static const int verbosity = 7; };
@@ -182,8 +183,8 @@ public:
 	virtual unsigned installWatch(LogFilter const& _filter);
 	virtual unsigned installWatch(h256 _filterId);
 	virtual void uninstallWatch(unsigned _watchId);
-	virtual bool peekWatch(unsigned _watchId) const { Guard l(m_filterLock); try { return m_watches.at(_watchId).changes != 0; } catch (...) { return false; } }
-	virtual bool checkWatch(unsigned _watchId) { Guard l(m_filterLock); bool ret = false; try { ret = m_watches.at(_watchId).changes != 0; m_watches.at(_watchId).changes = 0; } catch (...) {} return ret; }
+	virtual LocalisedLogEntries peekWatch(unsigned _watchId) const;
+	virtual LocalisedLogEntries checkWatch(unsigned _watchId);
 
 	virtual LocalisedLogEntries logs(unsigned _watchId) const { try { Guard l(m_filterLock); return logs(m_filters.at(m_watches.at(_watchId).id).filter); } catch (...) { return LocalisedLogEntries(); } }
 	virtual LocalisedLogEntries logs(LogFilter const& _filter) const;
@@ -286,11 +287,11 @@ private:
 
 	/// Collate the changed filters for the bloom filter of the given pending transaction.
 	/// Insert any filters that are activated into @a o_changed.
-	void appendFromNewPending(LogBloom _pendingTransactionBloom, h256Set& o_changed) const;
+	void appendFromNewPending(TransactionReceipt const& _receipt, h256Set& io_changed);
 
 	/// Collate the changed filters for the hash of the given block.
 	/// Insert any filters that are activated into @a o_changed.
-	void appendFromNewBlock(h256 _blockHash, h256Set& o_changed) const;
+	void appendFromNewBlock(h256 const& _blockHash, h256Set& io_changed);
 
 	/// Record that the set of filters @a _filters have changed.
 	/// This doesn't actually make any callbacks, but incrememnts some counters in m_watches.

libethereum/Interface.h

@@ -93,8 +93,8 @@ public:
 	virtual unsigned installWatch(LogFilter const& _filter) = 0;
 	virtual unsigned installWatch(h256 _filterId) = 0;
 	virtual void uninstallWatch(unsigned _watchId) = 0;
-	virtual bool peekWatch(unsigned _watchId) const = 0;
-	virtual bool checkWatch(unsigned _watchId) = 0;
+	virtual LocalisedLogEntries peekWatch(unsigned _watchId) const = 0;
+	virtual LocalisedLogEntries checkWatch(unsigned _watchId) = 0;
 
 	// [BLOCK QUERY API]
 
@@ -178,8 +178,8 @@ public:
 	Watch(Interface& _c, LogFilter const& _tf): m_c(&_c), m_id(_c.installWatch(_tf)) {}
 	~Watch() { if (m_c) m_c->uninstallWatch(m_id); }
 
-	bool check() { return m_c ? m_c->checkWatch(m_id) : false; }
-	bool peek() { return m_c ? m_c->peekWatch(m_id) : false; }
+	LocalisedLogEntries check() { return m_c ? m_c->checkWatch(m_id) : LocalisedLogEntries(); }
+	LocalisedLogEntries peek() { return m_c ? m_c->peekWatch(m_id) : LocalisedLogEntries(); }
 	LocalisedLogEntries logs() const { return m_c->logs(m_id); }
 
 private:

libethereum/LogFilter.cpp

@@ -68,14 +68,15 @@ bool LogFilter::matches(State const& _s, unsigned _i) const
 LogEntries LogFilter::matches(TransactionReceipt const& _m) const
 {
 	LogEntries ret;
-	for (LogEntry const& e: _m.log())
-	{
-		if (!m_addresses.empty() && !m_addresses.count(e.address))
-			continue;
-		for (auto const& t: m_topics)
-			if (!std::count(e.topics.begin(), e.topics.end(), t))
+	if (matches(_m.bloom()))
+		for (LogEntry const& e: _m.log())
+		{
+			if (!m_addresses.empty() && !m_addresses.count(e.address))
 				continue;
-		ret.push_back(e);
-	}
+			for (auto const& t: m_topics)
+				if (!std::count(e.topics.begin(), e.topics.end(), t))
+					continue;
+			ret.push_back(e);
+		}
 	return ret;
 }

libethereum/State.cpp

@@ -412,10 +412,10 @@ bool State::cull(TransactionQueue& _tq) const
 	return ret;
 }
 
-h512s State::sync(BlockChain const& _bc, TransactionQueue& _tq, bool* o_transactionQueueChanged)
+TransactionReceipts State::sync(BlockChain const& _bc, TransactionQueue& _tq, bool* o_transactionQueueChanged)
 {
 	// TRANSACTIONS
-	h512s ret;
+	TransactionReceipts ret;
 	auto ts = _tq.transactions();
 
 	auto lh = getLastHashes(_bc);
@@ -432,7 +432,7 @@ h512s State::sync(BlockChain const& _bc, TransactionQueue& _tq, bool* o_transact
 					uncommitToMine();
 //					boost::timer t;
 					execute(lh, i.second);
-					ret.push_back(m_receipts.back().bloom());
+					ret.push_back(m_receipts.back());
 					_tq.noteGood(i);
 					++goodTxs;
 //					cnote << "TX took:" << t.elapsed() * 1000;

libethereum/State.h

@@ -140,10 +140,10 @@ public:
 
 	// TODO: Cleaner interface.
 	/// Sync our transactions, killing those from the queue that we have and assimilating those that we don't.
-	/// @returns a list of bloom filters one for each transaction placed from the queue into the state.
+	/// @returns a list of receipts one for each transaction placed from the queue into the state.
 	/// @a o_transactionQueueChanged boolean pointer, the value of which will be set to true if the transaction queue
 	/// changed and the pointer is non-null
-	h512s sync(BlockChain const& _bc, TransactionQueue& _tq, bool* o_transactionQueueChanged = nullptr);
+	TransactionReceipts sync(BlockChain const& _bc, TransactionQueue& _tq, bool* o_transactionQueueChanged = nullptr);
 	/// Like sync but only operate on _tq, killing the invalid/old ones.
 	bool cull(TransactionQueue& _tq) const;
 

libweb3jsonrpc/WebThreeStubServer.cpp

@@ -347,9 +347,9 @@ std::string WebThreeStubServer::eth_call(Json::Value const& _json)
 	return ret;
 }
 
-bool WebThreeStubServer::eth_changed(int const& _id)
+Json::Value WebThreeStubServer::eth_changed(int const& _id)
 {
-	return client()->checkWatch(_id);
+	return toJson(client()->checkWatch(_id));
 }
 
 std::string WebThreeStubServer::eth_codeAt(string const& _address)

libweb3jsonrpc/WebThreeStubServer.h

@@ -71,7 +71,7 @@ public:
 	virtual Json::Value eth_blockByHash(std::string const& _hash);
 	virtual Json::Value eth_blockByNumber(int const& _number);
 	virtual std::string eth_call(Json::Value const& _json);
-	virtual bool eth_changed(int const& _id);
+	virtual Json::Value eth_changed(int const& _id);
 	virtual std::string eth_codeAt(std::string const& _address);
 	virtual std::string eth_coinbase();
 	virtual Json::Value eth_compilers();

libweb3jsonrpc/abstractwebthreestubserver.h

@@ -45,7 +45,7 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
             this->bindAndAddMethod(new jsonrpc::Procedure("eth_newFilter", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_INTEGER, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::eth_newFilterI);
             this->bindAndAddMethod(new jsonrpc::Procedure("eth_newFilterString", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_INTEGER, "param1",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::eth_newFilterStringI);
             this->bindAndAddMethod(new jsonrpc::Procedure("eth_uninstallFilter", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_uninstallFilterI);
-            this->bindAndAddMethod(new jsonrpc::Procedure("eth_changed", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_changedI);
+            this->bindAndAddMethod(new jsonrpc::Procedure("eth_changed", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_changedI);
             this->bindAndAddMethod(new jsonrpc::Procedure("eth_filterLogs", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_INTEGER, NULL), &AbstractWebThreeStubServer::eth_filterLogsI);
             this->bindAndAddMethod(new jsonrpc::Procedure("eth_logs", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_ARRAY, "param1",jsonrpc::JSON_OBJECT, NULL), &AbstractWebThreeStubServer::eth_logsI);
             this->bindAndAddMethod(new jsonrpc::Procedure("db_put", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING,"param2",jsonrpc::JSON_STRING,"param3",jsonrpc::JSON_STRING, NULL), &AbstractWebThreeStubServer::db_putI);
@@ -287,7 +287,7 @@ class AbstractWebThreeStubServer : public jsonrpc::AbstractServer<AbstractWebThr
         virtual int eth_newFilter(const Json::Value& param1) = 0;
         virtual int eth_newFilterString(const std::string& param1) = 0;
         virtual bool eth_uninstallFilter(const int& param1) = 0;
-        virtual bool eth_changed(const int& param1) = 0;
+        virtual Json::Value eth_changed(const int& param1) = 0;
         virtual Json::Value eth_filterLogs(const int& param1) = 0;
         virtual Json::Value eth_logs(const Json::Value& param1) = 0;
         virtual bool db_put(const std::string& param1, const std::string& param2, const std::string& param3) = 0;

libweb3jsonrpc/spec.json

@@ -39,7 +39,7 @@
             { "name": "eth_newFilter", "params": [{}], "order": [], "returns": 0},
             { "name": "eth_newFilterString", "params": [""], "order": [], "returns": 0},
             { "name": "eth_uninstallFilter", "params": [0], "order": [], "returns": true},
-            { "name": "eth_changed", "params": [0], "order": [], "returns": false},
+            { "name": "eth_changed", "params": [0], "order": [], "returns": []},
             { "name": "eth_filterLogs", "params": [0], "order": [], "returns": []},
             { "name": "eth_logs", "params": [{}], "order": [], "returns": []},
 

third/MainWin.cpp

@@ -182,14 +182,14 @@ void Main::onKeysChanged()
 	installBalancesWatch();
 }
 
-unsigned Main::installWatch(dev::eth::LogFilter const& _tf, std::function<void()> const& _f)
+unsigned Main::installWatch(dev::eth::LogFilter const& _tf, WatchHandler const& _f)
 {
 	auto ret = ethereum()->installWatch(_tf);
 	m_handlers[ret] = _f;
 	return ret;
 }
 
-unsigned Main::installWatch(dev::h256 _tf, std::function<void()> const& _f)
+unsigned Main::installWatch(dev::h256 _tf, WatchHandler const& _f)
 {
 	auto ret = ethereum()->installWatch(_tf);
 	m_handlers[ret] = _f;
@@ -198,21 +198,21 @@ unsigned Main::installWatch(dev::h256 _tf, std::function<void()> const& _f)
 
 void Main::installWatches()
 {
-	installWatch(dev::eth::LogFilter().topic((u256)(u160)c_config).topic((u256)0), [=](){ installNameRegWatch(); });
-	installWatch(dev::eth::LogFilter().topic((u256)(u160)c_config).topic((u256)1), [=](){ installCurrenciesWatch(); });
-	installWatch(dev::eth::ChainChangedFilter, [=](){ onNewBlock(); });
+	installWatch(dev::eth::LogFilter().topic((u256)(u160)c_config).topic((u256)0), [=](LocalisedLogEntries const&){ installNameRegWatch(); });
+	installWatch(dev::eth::LogFilter().topic((u256)(u160)c_config).topic((u256)1), [=](LocalisedLogEntries const&){ installCurrenciesWatch(); });
+	installWatch(dev::eth::ChainChangedFilter, [=](LocalisedLogEntries const&){ onNewBlock(); });
 }
 
 void Main::installNameRegWatch()
 {
 	ethereum()->uninstallWatch(m_nameRegFilter);
-	m_nameRegFilter = installWatch(dev::eth::LogFilter().topic(ethereum()->stateAt(c_config, 0)), [=](){ onNameRegChange(); });
+	m_nameRegFilter = installWatch(dev::eth::LogFilter().topic(ethereum()->stateAt(c_config, 0)), [=](LocalisedLogEntries const&){ onNameRegChange(); });
 }
 
 void Main::installCurrenciesWatch()
 {
 	ethereum()->uninstallWatch(m_currenciesFilter);
-	m_currenciesFilter = installWatch(dev::eth::LogFilter().topic(ethereum()->stateAt(c_config, 1)), [=](){ onCurrenciesChange(); });
+	m_currenciesFilter = installWatch(dev::eth::LogFilter().topic(ethereum()->stateAt(c_config, 1)), [=](LocalisedLogEntries const&){ onCurrenciesChange(); });
 }
 
 void Main::installBalancesWatch()
@@ -228,7 +228,7 @@ void Main::installBalancesWatch()
 			tf.address(c).topic((u256)(u160)i.address());
 
 	ethereum()->uninstallWatch(m_balancesFilter);
-	m_balancesFilter = installWatch(tf, [=](){ onBalancesChange(); });
+	m_balancesFilter = installWatch(tf, [=](LocalisedLogEntries const&){ onBalancesChange(); });
 }
 
 void Main::onNameRegChange()
@@ -536,8 +536,11 @@ void Main::timerEvent(QTimerEvent*)
 		m_qweb->poll();
 
 	for (auto const& i: m_handlers)
-		if (ethereum()->checkWatch(i.first))
-			i.second();
+	{
+		auto ls = ethereum()->checkWatch(i.first);
+		if (ls.size())
+			i.second(ls);
+	}
 }
 
 void Main::ourAccountsRowsMoved()

third/MainWin.h

@@ -50,6 +50,8 @@ class WhisperHost;
 class QQuickView;
 class WebThreeStubServer;
 
+using WatchHandler = std::function<void(dev::eth::LocalisedLogEntries const&)>;
+
 class Main : public QMainWindow
 {
 	Q_OBJECT
@@ -95,8 +97,8 @@ private:
 	void readSettings(bool _skipGeometry = false);
 	void writeSettings();
 
-	unsigned installWatch(dev::eth::LogFilter const& _tf, std::function<void()> const& _f);
-	unsigned installWatch(dev::h256 _tf, std::function<void()> const& _f);
+	unsigned installWatch(dev::eth::LogFilter const& _tf, WatchHandler const& _f);
+	unsigned installWatch(dev::h256 _tf, WatchHandler const& _f);
 
 	void onNewBlock();
 	void onNameRegChange();
@@ -124,7 +126,7 @@ private:
 	QList<dev::KeyPair> m_myKeys;
 	QList<dev::KeyPair> m_myIdentities;
 
-	std::map<unsigned, std::function<void()>> m_handlers;
+	std::map<unsigned, WatchHandler> m_handlers;
 	unsigned m_nameRegFilter = (unsigned)-1;
 	unsigned m_currenciesFilter = (unsigned)-1;
 	unsigned m_balancesFilter = (unsigned)-1;