removed switchover time check

diff --git a/p2pool/data.py b/p2pool/data.py
index 129fafa..cdf2076 100644 (file)
--- a/p2pool/data.py
+++ b/p2pool/data.py
@@ -207,10 +207,6 @@ class Share(object):
         self.new_script = bitcoin_data.pubkey_hash_to_script2(self.share_data['pubkey_hash'])
         self.desired_version = self.share_data['desired_version']
         
-        if self.timestamp < net.SWITCH_TIME:
-            from p2pool import p2p
-            raise p2p.PeerMisbehavingError('peer sent a new-style share with a timestamp before the switch time')
-        
         self.gentx_hash = check_hash_link(
             self.hash_link,
             self.get_ref_hash(net, self.share_info, common['ref_merkle_link']) + pack.IntType(32).pack(0),

diff --git a/p2pool/networks.py b/p2pool/networks.py
index 3dba825..c5cfb4a 100644 (file)
--- a/p2pool/networks.py
+++ b/p2pool/networks.py
@@ -24,7 +24,6 @@ nets = dict(
         BOOTSTRAP_ADDRS='74.220.242.6:9334 93.97.192.93 66.90.73.83 67.83.108.0 219.84.64.174 24.167.17.248 109.74.195.142 83.211.86.49 89.78.212.44 94.23.34.145 168.7.116.243 72.14.191.28 94.174.40.189:9344'.split(' '),
         ANNOUNCE_CHANNEL='#p2pool',
         VERSION_CHECK=lambda v, temp_work: 50400 <= v < 60000 or 60003 <= v or '/P2SH/' in temp_work['coinbaseflags'],
-        SWITCH_TIME=1333238400,
     ),
     bitcoin_testnet=math.Object(
         PARENT=networks.nets['bitcoin_testnet'],
@@ -42,7 +41,6 @@ nets = dict(
         BOOTSTRAP_ADDRS='72.14.191.28'.split(' '),
         ANNOUNCE_CHANNEL='#p2pool-alt',
         VERSION_CHECK=lambda v, temp_work: 50400 <= v < 60000 or 60003 <= v or '/P2SH/' in temp_work['coinbaseflags'],
-        SWITCH_TIME=1333238400-60*60*24*7,
     ),
     
     litecoin=math.Object(
@@ -61,7 +59,6 @@ nets = dict(
         BOOTSTRAP_ADDRS='76.26.53.101 124.205.120.178 190.195.79.161 173.167.113.73 82.161.65.210 67.83.108.0 78.101.67.239 78.100.161.252 87.58.117.233 78.100.162.223 216.239.45.4 78.101.131.221 72.14.191.28 97.81.163.217 69.126.183.240 219.84.64.174 78.101.119.27 89.211.228.244 178.152.122.30 172.16.0.3 76.26.53.101:51319'.split(' '),
         ANNOUNCE_CHANNEL='#p2pool-alt',
         VERSION_CHECK=lambda v, temp_work: True,
-        SWITCH_TIME=1333238400-60*60*24*5,
     ),
     litecoin_testnet=math.Object(
         PARENT=networks.nets['litecoin_testnet'],
@@ -79,7 +76,6 @@ nets = dict(
         BOOTSTRAP_ADDRS='72.14.191.28'.split(' '),
         ANNOUNCE_CHANNEL='#p2pool-alt',
         VERSION_CHECK=lambda v, temp_work: True,
-        SWITCH_TIME=1332276298,
     ),
 )
 for net_name, net in nets.iteritems():