drop b-cash nodes

Author: voisine

BRPeer.h

@@ -60,7 +60,8 @@ extern "C" {
 
 #define SERVICES_NODE_NETWORK 0x01 // services value indicating a node carries full blocks, not just headers
 #define SERVICES_NODE_BLOOM   0x04 // BIP111: https://github.com/bitcoin/bips/blob/master/bip-0111.mediawiki
-
+#define SERVICES_NODE_BCASH   0x20 // https://github.com/Bitcoin-UAHF/spec/blob/master/uahf-technical-spec.md
+    
 #define BR_VERSION "0.6.2"
 #define USER_AGENT "/breadwallet:" BR_VERSION "/"
 

BRPeerManager.c

@@ -805,14 +805,22 @@ static void _peerConnected(void *info)
     pthread_mutex_lock(&manager->lock);
     if (peer->timestamp > now + 2*60*60 || peer->timestamp < now - 2*60*60) peer->timestamp = now; // sanity check
 
-    // drop peers that don't carry full blocks, or aren't synced yet
     // TODO: XXX does this work with 0.11 pruned nodes?
-    if (! (peer->services & SERVICES_NODE_NETWORK) ||
-        BRPeerLastBlock(peer) + 10 < manager->lastBlock->height) {
+    if (! (peer->services & SERVICES_NODE_NETWORK)) {
+        peer_log(peer, "node doesn't carry full blocks");
+        BRPeerDisconnect(peer);
+    }
+    else if (BRPeerLastBlock(peer) + 10 < manager->lastBlock->height) {
+        peer_log(peer, "node isn't synced");
+        BRPeerDisconnect(peer);
+    }
+    else if ((peer->services & SERVICES_NODE_BCASH) == SERVICES_NODE_BCASH) {
+        peer_log(peer, "b-cash nodes not supported");
         BRPeerDisconnect(peer);
     }
     else if (BRPeerVersion(peer) >= 70011 && ! (peer->services & SERVICES_NODE_BLOOM)) {
-        BRPeerDisconnect(peer); // drop peers that don't support SPV filtering
+        peer_log(peer, "node doesn't support SPV mode");
+        BRPeerDisconnect(peer);
     }
     else if (manager->downloadPeer && // check if we should stick with the existing download peer
              (BRPeerLastBlock(manager->downloadPeer) >= BRPeerLastBlock(peer) ||