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

libjsqrc/ethereumjs/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "ethereum.js",
   "namespace": "ethereum",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Ethereum Compatible JavaScript API",
   "main": [
     "./dist/ethereum.js",

libjsqrc/ethereumjs/dist/ethereum.js

@@ -2656,7 +2656,7 @@ var requestManager = function() {
     var poll = function () {
         polls.forEach(function (data) {
             // send async
-            send(data.data, function(result){
+            send(data.data, function(error, result){
                 if (!(result instanceof Array) || result.length === 0) {
                     return;
                 }

libjsqrc/ethereumjs/lib/web3/requestmanager.js

@@ -136,7 +136,7 @@ var requestManager = function() {
     var poll = function () {
         polls.forEach(function (data) {
             // send async
-            send(data.data, function(result){
+            send(data.data, function(error, result){
                 if (!(result instanceof Array) || result.length === 0) {
                     return;
                 }

libjsqrc/ethereumjs/package.js

@@ -1,7 +1,7 @@
 /* jshint ignore:start */
 Package.describe({
   name: 'ethereum:js',
-  version: '0.1.1',
+  version: '0.1.2',
   summary: 'Ethereum JavaScript API, middleware to talk to a ethreum node over RPC',
   git: 'https://github.com/ethereum/ethereum.js',
   // By default, Meteor will default to using README.md for documentation.

libjsqrc/ethereumjs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ethereum.js",
   "namespace": "ethereum",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Ethereum JavaScript API, middleware to talk to a ethreum node over RPC",
   "main": "./index.js",
   "directories": {

libp2p/NodeTable.cpp

@@ -97,7 +97,7 @@ shared_ptr<NodeEntry> NodeTable::addNode(Node const& _node)
 	m_socketPointer->send(p);
 	
 	// TODO p2p: rename to p2p.nodes.pending, add p2p.nodes.add event (when pong is received)
-	clog(NodeTableNote) << "p2p.nodes.add " << _node.id.abridged();
+	clog(NodeTableUpdate) << "p2p.nodes.add " << _node.id.abridged();
 	if (m_nodeEventHandler)
 		m_nodeEventHandler->appendEvent(_node.id, NodeEntryAdded);
 	
@@ -159,7 +159,7 @@ void NodeTable::discover(NodeId _node, unsigned _round, shared_ptr<set<shared_pt
 	
 	if (_round == s_maxSteps)
 	{
-		clog(NodeTableNote) << "Terminating discover after " << _round << " rounds.";
+		clog(NodeTableEvent) << "Terminating discover after " << _round << " rounds.";
 		return;
 	}
 	else if(!_round && !_tried)
@@ -180,7 +180,7 @@ void NodeTable::discover(NodeId _node, unsigned _round, shared_ptr<set<shared_pt
 	
 	if (tried.empty())
 	{
-		clog(NodeTableNote) << "Terminating discover after " << _round << " rounds.";
+		clog(NodeTableEvent) << "Terminating discover after " << _round << " rounds.";
 		return;
 	}
 		
@@ -308,7 +308,7 @@ void NodeTable::noteActiveNode(Public const& _pubk, bi::udp::endpoint const& _en
 	if (_pubk == m_node.address())
 		return;
 	
-	clog(NodeTableNote) << "Noting active node:" << _pubk.abridged() << _endpoint.address().to_string() << ":" << _endpoint.port();
+	clog(NodeTableConnect) << "Noting active node:" << _pubk.abridged() << _endpoint.address().to_string() << ":" << _endpoint.port();
 
 	shared_ptr<NodeEntry> node(addNode(_pubk, _endpoint, bi::tcp::endpoint(_endpoint.address(), _endpoint.port())));
 
@@ -361,7 +361,7 @@ void NodeTable::dropNode(shared_ptr<NodeEntry> _n)
 		m_nodes.erase(_n->id);
 	}
 	
-	clog(NodeTableNote) << "p2p.nodes.drop " << _n->id.abridged();
+	clog(NodeTableUpdate) << "p2p.nodes.drop " << _n->id.abridged();
 	if (m_nodeEventHandler)
 		m_nodeEventHandler->appendEvent(_n->id, NodeEntryRemoved);
 }
@@ -376,7 +376,7 @@ void NodeTable::onReceived(UDPSocketFace*, bi::udp::endpoint const& _from, bytes
 	// h256 + Signature + type + RLP (smallest possible packet is empty neighbours packet which is 3 bytes)
 	if (_packet.size() < h256::size + Signature::size + 1 + 3)
 	{
-		clog(NodeTableMessageSummary) << "Invalid Message size from " << _from.address().to_string() << ":" << _from.port();
+		clog(NodeTableWarn) << "Invalid Message size from " << _from.address().to_string() << ":" << _from.port();
 		return;
 	}
 	
@@ -384,7 +384,7 @@ void NodeTable::onReceived(UDPSocketFace*, bi::udp::endpoint const& _from, bytes
 	h256 hashSigned(sha3(hashedBytes));
 	if (!_packet.cropped(0, h256::size).contentsEqual(hashSigned.asBytes()))
 	{
-		clog(NodeTableMessageSummary) << "Invalid Message hash from " << _from.address().to_string() << ":" << _from.port();
+		clog(NodeTableWarn) << "Invalid Message hash from " << _from.address().to_string() << ":" << _from.port();
 		return;
 	}
 	
@@ -396,7 +396,7 @@ void NodeTable::onReceived(UDPSocketFace*, bi::udp::endpoint const& _from, bytes
 	Public nodeid(dev::recover(*(Signature const*)sigBytes.data(), sha3(signedBytes)));
 	if (!nodeid)
 	{
-		clog(NodeTableMessageSummary) << "Invalid Message signature from " << _from.address().to_string() << ":" << _from.port();
+		clog(NodeTableWarn) << "Invalid Message signature from " << _from.address().to_string() << ":" << _from.port();
 		return;
 	}
 	
@@ -516,7 +516,7 @@ void NodeTable::doRefreshBuckets(boost::system::error_code const& _ec)
 	if (_ec)
 		return;
 
-	clog(NodeTableNote) << "refreshing buckets";
+	clog(NodeTableEvent) << "refreshing buckets";
 	bool connected = m_socketPointer->isOpen();
 	bool refreshed = false;
 	if (connected)

libp2p/NodeTable.h

@@ -411,8 +411,11 @@ struct Neighbours: RLPXDatagram<Neighbours>
 struct NodeTableWarn: public LogChannel { static const char* name() { return "!P!"; } static const int verbosity = 0; };
 struct NodeTableNote: public LogChannel { static const char* name() { return "*P*"; } static const int verbosity = 1; };
 struct NodeTableMessageSummary: public LogChannel { static const char* name() { return "-P-"; } static const int verbosity = 2; };
-struct NodeTableConnect: public LogChannel { static const char* name() { return "+P+"; } static const int verbosity = 10; };
 struct NodeTableMessageDetail: public LogChannel { static const char* name() { return "=P="; } static const int verbosity = 5; };
+struct NodeTableConnect: public LogChannel { static const char* name() { return "+P+"; } static const int verbosity = 10; };
+struct NodeTableEvent: public LogChannel { static const char* name() { return "+P+"; } static const int verbosity = 10; };
+struct NodeTableTimer: public LogChannel { static const char* name() { return "+P+"; } static const int verbosity = 10; };
+struct NodeTableUpdate: public LogChannel { static const char* name() { return "+P+"; } static const int verbosity = 10; };
 struct NodeTableTriviaSummary: public LogChannel { static const char* name() { return "-P-"; } static const int verbosity = 10; };
 struct NodeTableTriviaDetail: public LogChannel { static const char* name() { return "=P="; } static const int verbosity = 11; };
 struct NodeTableAllDetail: public LogChannel { static const char* name() { return "=P="; } static const int verbosity = 13; };

libp2p/RLPxHandshake.cpp

@@ -98,7 +98,7 @@ void RLPXHandshake::readAuth()
 		}
 		else
 		{
-			clog(NetWarn) << "p2p.connect.egress recving auth decrypt failed for" << m_socket->remoteEndpoint();
+			clog(NetConnect) << "p2p.connect.ingress recving auth decrypt failed for" << m_socket->remoteEndpoint();
 			m_nextState = Error;
 			transition();
 		}
@@ -122,7 +122,7 @@ void RLPXHandshake::readAck()
 		}
 		else
 		{
-			clog(NetWarn) << "p2p.connect.egress recving ack decrypt failed for " << m_socket->remoteEndpoint();
+			clog(NetConnect) << "p2p.connect.egress recving ack decrypt failed for " << m_socket->remoteEndpoint();
 			m_nextState = Error;
 			transition();
 		}
@@ -162,11 +162,7 @@ void RLPXHandshake::transition(boost::system::error_code _ech)
 	else if (m_nextState == WriteHello)
 	{
 		m_nextState = ReadHello;
-		
-		if (m_originated)
-			clog(NetConnect) << "p2p.connect.egress sending capabilities handshake";
-		else
-			clog(NetConnect) << "p2p.connect.ingress sending capabilities handshake";
+		clog(NetConnect) << (m_originated ? "p2p.connect.egress" : "p2p.connect.ingress") << "sending capabilities handshake";
 
 		/// This pointer will be freed if there is an error otherwise
 		/// it will be passed to Host which will take ownership.

mix/qml/html/WebContainer.html

@@ -33,7 +33,7 @@ updateContracts = function(contracts) {
 init = function(url) {
 	web3 = require('web3');
 	window.web3 = web3;
-	web3.setProvider(new web3.providers.HttpSyncProvider(url));
+	web3.setProvider(new web3.providers.HttpProvider(url));
 };
 
 executeJavaScript = function(script) {