remove logic to transition share period from 5 seconds to 10 seconds on the bitcoin...

diff --git a/p2pool/data.py b/p2pool/data.py
index faf00af..41d6ed1 100644 (file)
--- a/p2pool/data.py
+++ b/p2pool/data.py
@@ -226,10 +226,7 @@ def generate_transaction(tracker, previous_share_hash, new_script, subsidy, nonc
     else:
         attempts_per_second = get_pool_attempts_per_second(tracker, previous_share_hash, net)
         previous_share = tracker.shares[previous_share_hash] if previous_share_hash is not None else None
-        period = net.SHARE_PERIOD
-        if previous_share.timestamp >= 1314582520 and hasattr(net, 'SHARE_PERIOD2'): # note that this is 3 days from that commit, not a week
-            period = net.SHARE_PERIOD2
-        pre_target = 2**256//(period*attempts_per_second) - 1
+        pre_target = 2**256//(net.SHARE_PERIOD*attempts_per_second) - 1
         pre_target2 = math.clip(pre_target, (previous_share.target*9//10, previous_share.target*11//10))
         pre_target3 = math.clip(pre_target2, (0, net.MAX_TARGET))
         target = bitcoin_data.FloatingInteger.from_target_upper_bound(pre_target3)
@@ -541,8 +538,7 @@ class ShareStore(object):
             print "REMOVED", filename
 
 class Mainnet(bitcoin_data.Mainnet):
-    SHARE_PERIOD = 5 # seconds
-    SHARE_PERIOD2 = 10 # seconds
+    SHARE_PERIOD = 10 # seconds
     CHAIN_LENGTH = 24*60*60//5 # shares
     TARGET_LOOKBEHIND = 200 # shares
     SPREAD = 3 # blocks