Merge branch 'stratum_quickupdate'

config.py.example

@@ -33,6 +33,9 @@ DynamicTargetGoal = 8
 # Number of seconds hashrate is measured over
 DynamicTargetWindow = 120
 
+# Should we try to adjust the target quickly when there are a lot of shares?
+DynamicTargetQuick = True
+
 # Minimum and maximum of merkle roots to keep queued
 WorkQueueSizeRegular = (0x100, 0x1000)
 

eloipool.py

@@ -215,10 +215,13 @@ def WorkLogPruner(wl):
 
 if not hasattr(config, 'DynamicTargetting'):
 	config.DynamicTargetting = 0
+	config.DynamicTargetQuick = False
 else:
 	if not hasattr(config, 'DynamicTargetWindow'):
 		config.DynamicTargetWindow = 120
 	config.DynamicTargetGoal *= config.DynamicTargetWindow / 60
+	if not hasattr(config, 'DynamicTargetQuick'):
+		config.DynamicTargetQuick = True
 
 def submitGotwork(info):
 	try:
@@ -478,7 +481,7 @@ def checkShare(share):
 	shareTime = share['time'] = time()
 
 	username = share['username']
-	isstratum = False
+	checkQuickDiffAdjustment = False
 	if 'data' in share:
 		# getwork/GBT
 		checkData(share)
@@ -507,7 +510,7 @@ def checkShare(share):
 			coinbase = None
 	else:
 		# Stratum
-		isstratum = True
+		checkQuickDiffAdjustment = config.DynamicTargetQuick
 		wli = share['jobid']
 		buildStratumData(share, b'\0' * 32)
 		mode = 'MC'
@@ -650,7 +653,7 @@ def checkShare(share):
 			userStatus[username][2] += 1
 		else:
 			userStatus[username][2] += float(target) / workTarget
-		if isstratum and userStatus[username][2] > config.DynamicTargetGoal * 2:
+		if checkQuickDiffAdjustment and userStatus[username][2] > config.DynamicTargetGoal * 2:
 			stratumsrv.quickDifficultyUpdate(username)
 checkShare.logger = logging.getLogger('checkShare')