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

alethzero/Main.ui

@@ -1289,7 +1289,7 @@ font-size: 14pt</string>
           <string notr="true">background: white;
 border: 0;
 font-family: Monospace, Ubuntu Mono, Lucida Console, Courier New;
-font-size: 12pt</string>
+font-size: 14pt</string>
          </property>
          <property name="inputMask">
           <string/>

alethzero/MainWin.cpp

@@ -803,6 +803,7 @@ void Main::on_blocks_currentItemChanged()
 {
 	ui->info->clear();
 	eth::ClientGuard g(m_client.get());
+	debugFinished();
 	if (auto item = ui->blocks->currentItem())
 	{
 		auto hba = item->data(Qt::UserRole).toByteArray();
@@ -876,7 +877,6 @@ void Main::on_blocks_currentItemChanged()
 			Transaction t = st.pending()[txi];
 			auto r = t.rlp();
 
-			debugFinished();
 			bool done = m_currentExecution->setup(&r);
 			if (!done)
 			{

libethereum/Client.h

@@ -77,6 +77,27 @@ private:
 	unsigned m_protocolVersion;
 };
 
+class TransactionFilter
+{
+public:
+	TransactionFilter(int _blockFrom = 0, int _blockTo = -1, unsigned _max = 10): m_blockFrom(_blockFrom), m_blockTo(_blockTo), m_max(_max) {}
+
+	TransactionFilter from(Address _a) { m_from.insert(_a); return *this; }
+	TransactionFilter to(Address _a) { m_to.insert(_a); return *this; }
+	TransactionFilter stateAltered(Address _a, u256 _l) { m_stateAltered.insert(std::make_pair(_a, _l)); return *this; }
+	TransactionFilter stateAltered(Address _a) { m_altered.insert(_a); return *this; }
+	TransactionFilter withMax(unsigned _m) { m_max = _m; return *this; }
+
+private:
+	std::set<Address> m_from;
+	std::set<Address> m_to;
+	std::set<std::pair<Address, u256>> m_stateAltered;
+	std::set<Address> m_altered;
+	int m_blockFrom;
+	int m_blockTo;
+	unsigned m_max;
+};
+
 /**
  * @brief Main API hub for interfacing with Ethereum.
  */
@@ -145,7 +166,7 @@ public:
 	u256 countAt(Address _a, int _block = -1) const;
 	u256 stateAt(Address _a, u256 _l, int _block = -1) const;
 	bytes codeAt(Address _a, int _block = -1) const;
-	Transactions transactions(Addresses const& _from, Addresses const& _to, std::vector<std::pair<u256, u256>> const& _stateAlterations, Addresses const& _altered, int _blockFrom = 0, int _blockTo = -1, unsigned _max = 10) const;
+	Transactions transactions(TransactionFilter const& _f) const;
 
 	// Misc stuff:
 
@@ -195,6 +216,9 @@ public:
 private:
 	void work();
 
+	/// Return the actual block number of the block with the given int-number (positive/zero is the same, -(1 << 31) is next to be mined, < 0 is negative age, thus -1 is most recently mined, 0 is genesis.
+	unsigned blockNumber(int _b) const;
+
 	std::string m_clientVersion;		///< Our end-application client's name/version.
 	VersionChecker m_vc;				///< Dummy object to check & update the protocol version.
 	BlockChain m_bc;					///< Maintains block database.

liblll/Assembly.cpp

@@ -22,7 +22,6 @@
 #include "Assembly.h"
 
 #include <libethential/Log.h>
-#include <libethcore/CommonEth.h>
 
 using namespace std;
 using namespace eth;

liblll/Parser.cpp

@@ -24,7 +24,6 @@
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix.hpp>
 #include <boost/spirit/include/support_utree.hpp>
-#include <libethcore/CommonEth.h>
 
 using namespace std;
 using namespace eth;
@@ -73,6 +72,10 @@ void eth::parseTreeLLL(string const& _s, sp::utree& o_out)
 	typedef sp::basic_string<std::string, sp::utree_type::symbol_type> symbol_type;
 	typedef string::const_iterator it;
 
+	static const u256 ether = u256(1000000000) * 1000000000;
+	static const u256 finney = u256(1000000000) * 1000000;
+	static const u256 szabo = u256(1000000000) * 1000;
+
 	qi::rule<it, qi::ascii::space_type, sp::utree()> element;
 	qi::rule<it, string()> str = '"' > qi::lexeme[+(~qi::char_(std::string("\"") + '\0'))] > '"';
 	qi::rule<it, string()> strsh = '\'' > qi::lexeme[+(~qi::char_(std::string(" ;@()[]{}:") + '\0'))];

stdserv.js

@@ -52,8 +52,7 @@ eth.transact(eth.key, '0', config, "0".pad(32) + nameReg.pad(32), 10000, eth.gas
 
 var gavCoinCode = eth.lll("{
   [[ (caller) ]]: 0x1000000
-  [0] 'GavCoin
-  (call (- (gas) 100) " + nameReg + " 0 0 7 0 0)
+  (call (- (gas) 100) " + nameReg + " 0 0 (lit 0 'GavCoin) 0 0)
   (returnlll {
     (when (!= (calldatasize) 64) (stop))
     [fromBal] @@(caller)