increased timestamp advance from 12 to 120 seconds to avoid miners working on overlap...

diff --git a/p2pool/bitcoin/worker_interface.py b/p2pool/bitcoin/worker_interface.py
index 7bd0f4a..f02c090 100644 (file)
--- a/p2pool/bitcoin/worker_interface.py
+++ b/p2pool/bitcoin/worker_interface.py
@@ -97,8 +97,8 @@ class WorkerInterface(object):
         
         self.merkle_root_to_handler[res.merkle_root] = handler
         
-        if res.timestamp + 12 < orig_timestamp + 600:
-            self.work_cache[key] = res.update(timestamp=res.timestamp + 12), orig_timestamp, handler
+        if res.timestamp + 120 < orig_timestamp + 1800:
+            self.work_cache[key] = res.update(timestamp=res.timestamp + 120), orig_timestamp, handler
         
         if p2pool.DEBUG:
             print 'POLL %i END identifier=%i' % (id, self.worker_bridge.new_work_event.times)