From 0a2fe2a0b1d2d96bae9a2270aa65f3b997262072 Mon Sep 17 00:00:00 2001
From: Kevin Froman <beardog@firemail.cc>
Date: Fri, 3 Aug 2018 15:01:13 -0500
Subject: [PATCH] * punish peers that share invalid blocks * fixed profile
 crash

---
 onionr/communicator2.py | 6 +++++-
 onionr/onionrpeers.py   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/onionr/communicator2.py b/onionr/communicator2.py
index 1f343186..b641b76e 100755
--- a/onionr/communicator2.py
+++ b/onionr/communicator2.py
@@ -179,7 +179,8 @@ class OnionrCommunicatorDaemon:
                 continue
             self.currentDownloading.append(blockHash)
             logger.info("Attempting to download %s..." % blockHash)
-            content = self.peerAction(self.pickOnlinePeer(), 'getData', data=blockHash) # block content from random peer (includes metadata)
+            peerUsed = self.pickOnlinePeer()
+            content = self.peerAction(peerUsed, 'getData', data=blockHash) # block content from random peer (includes metadata)
             if content != False:
                 try:
                     content = content.encode()
@@ -213,6 +214,8 @@ class OnionrCommunicatorDaemon:
                         tempHash = tempHash.decode()
                     except AttributeError:
                         pass
+                    # Punish peer for sharing invalid block (not always malicious, but is bad regardless)
+                    onionrpeers.PeerProfiles(peerUsed, self._core).addScore(-50)  
                     logger.warn('Block hash validation failed for ' + blockHash + ' got ' + tempHash)
                 self.blockQueue.remove(blockHash) # remove from block queue both if success or false
             self.currentDownloading.remove(blockHash)
@@ -424,6 +427,7 @@ class OnionrCommunicatorDaemon:
             triedPeers.append(peer)
             url = 'http://' + peer + '/public/upload/'
             data = {'block': block.Block(self.blockToUpload).getRaw()}
+            proxyType = ''
             if peer.endswith('.onion'):
                 proxyType = 'tor'
             elif peer.endswith('.i2p'):
diff --git a/onionr/onionrpeers.py b/onionr/onionrpeers.py
index 135b8d12..21697033 100644
--- a/onionr/onionrpeers.py
+++ b/onionr/onionrpeers.py
@@ -77,6 +77,7 @@ def peerCleanup(coreInst):
         raise TypeError('coreInst must be instance of core.Core')
 
     logger.info('Cleaning peers...')
+    config.reload()
 
     minScore = int(config.get('peers.minimumScore'))
     maxPeers = int(config.get('peers.maxStoredPeers'))