From: slush <info@bitcoin.cz>
Date: Tue, 2 Oct 2012 16:53:17 +0000 (+0000)
Subject: Merge branch 'master' of github.com:slush0/stratum-mining
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=2aea387baf458ee389fc11917c6f163a3774888f;hp=e01b14a5521c417d6546feb7d5e1eab96f44f1e3;p=stratum-mining.git

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
--- 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