From 34aa892b6502ece4f4d920acf732073da01bb15c Mon Sep 17 00:00:00 2001
From: Kevin Froman <beardog@firemail.cc>
Date: Sun, 28 Oct 2018 00:06:18 -0500
Subject: [PATCH] work on using dynamic/configurable POW

---
 onionr/onionrcrypto.py                 | 3 ++-
 onionr/onionrproofs.py                 | 7 ++++---
 onionr/static-data/default_config.json | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/onionr/onionrcrypto.py b/onionr/onionrcrypto.py
index 678a4457..c717935c 100644
--- a/onionr/onionrcrypto.py
+++ b/onionr/onionrcrypto.py
@@ -269,7 +269,8 @@ class OnionrCrypto:
             pass
 
         difficulty = math.floor(dataLen / 1000000)
-
+        if difficulty < int(config.get('general.minimum_block_pow')):
+            difficulty = int(config.get('general.minimum_block_pow'))
         mainHash = '0000000000000000000000000000000000000000000000000000000000000000'#nacl.hash.blake2b(nacl.utils.random()).decode()
         puzzle = mainHash[:difficulty]
 
diff --git a/onionr/onionrproofs.py b/onionr/onionrproofs.py
index b93d5724..0288343b 100644
--- a/onionr/onionrproofs.py
+++ b/onionr/onionrproofs.py
@@ -19,7 +19,7 @@
 '''
 
 import nacl.encoding, nacl.hash, nacl.utils, time, math, threading, binascii, logger, sys, base64, json
-import core
+import core, config
 
 class DataPOW:
     def __init__(self, data, forceDifficulty=0, threadCount = 5):
@@ -27,6 +27,7 @@ class DataPOW:
         self.difficulty = 0
         self.data = data
         self.threadCount = threadCount
+        config.reload()
 
         if forceDifficulty == 0:
             dataLen = sys.getsizeof(data)
@@ -128,7 +129,7 @@ class POW:
         dataLen = len(data) + len(json.dumps(metadata))
         self.difficulty = math.floor(dataLen / 1000000)
         if self.difficulty <= 2:
-            self.difficulty = 4
+            self.difficulty = int(config.get('general.minimum_block_pow'))
 
         try:
             self.data = self.data.encode()
@@ -144,7 +145,7 @@ class POW:
         for i in range(max(1, threadCount)):
             t = threading.Thread(name = 'thread%s' % i, target = self.pow, args = (True,myCore))
             t.start()
-        
+        self.myCore = myCore
         return
 
     def pow(self, reporting = False, myCore = None):
diff --git a/onionr/static-data/default_config.json b/onionr/static-data/default_config.json
index de27f4c1..3841b05c 100644
--- a/onionr/static-data/default_config.json
+++ b/onionr/static-data/default_config.json
@@ -2,6 +2,7 @@
     "general" : {
         "dev_mode": true,
         "display_header" : true,
+        "minimum_block_pow": 5,
 
         "direct_connect" : {
             "respond" : true,