Merge branch 'master' of github.com:slush0/stratum-mining

diff --git a/lib/block_template.py b/lib/block_template.py
index 4573c0d..32b63b2 100644 (file)
--- a/lib/block_template.py
+++ b/lib/block_template.py
@@ -112,7 +112,7 @@ class BlockTemplate(halfnode.CBlock):
         if ntime < self.curtime:
             return False
         
-        if ntime > (self.timestamper.time() + 60):
+        if ntime > (self.timestamper.time() + 1000):
             # Be strict on ntime into the near future
             # may be unnecessary
             return False
@@ -137,4 +137,4 @@ class BlockTemplate(halfnode.CBlock):
         self.nTime = ntime
         self.nNonce = nonce
         self.vtx[0].set_extranonce(extranonce1_bin + extranonce2_bin)        
-        self.sha256 = None # We changed block parameters, let's reset sha256 cache
\ No newline at end of file
+        self.sha256 = None # We changed block parameters, let's reset sha256 cache