testing
authorforrest <forrest@470744a7-cac9-478e-843e-5ec1b25c69e8>
Thu, 16 Jun 2011 14:22:14 +0000 (14:22 +0000)
committerforrest <forrest@470744a7-cac9-478e-843e-5ec1b25c69e8>
Thu, 16 Jun 2011 14:22:14 +0000 (14:22 +0000)
git-svn-id: svn://forre.st/p2pool@1341 470744a7-cac9-478e-843e-5ec1b25c69e8

p2p.py
p2pool.py

diff --git a/p2p.py b/p2p.py
index 7b06891..ffc31c0 100644 (file)
--- a/p2p.py
+++ b/p2p.py
@@ -166,6 +166,7 @@ class Protocol(bitcoin_p2p.BaseProtocol):
     def _think2(self):
         while self.connected2:
             self.send_addrme(port=self.node.port)
+            print "sending addrme"
             yield util.sleep(random.expovariate(1/100))
     
     def handle_version(self, version, services, addr_to, addr_from, nonce, sub_version, mode, state):
index df240be..b9a8a4a 100644 (file)
--- a/p2pool.py
+++ b/p2pool.py
@@ -165,8 +165,8 @@ def generate_transaction(last_p2pool_block_hash, previous_share2, add_script, su
 # TARGET_MULTIPLIER needs to be less than the current difficulty to prevent miner clients from missing shares
 
 class Testnet(object):
-    TARGET_MULTIPLIER = 3000
-    SPREAD = 3000
+    TARGET_MULTIPLIER = 300000
+    SPREAD = 300000
     ROOT_BLOCK = 0x3575d1e7b40fe37ad12d41169a1012d26df5f3c35486e2abfbe9d2c
     SCRIPT = '410489175c7658845fd7c33d61029ebf4042e8386443ff6e6628fdb5ac938c31072dc61cee691ae1e8355c3a87cb4813cc9bf036fdb09078d35eacf9e9ab52374ebeac'.decode('hex')
     IDENTIFIER = 0x808330dc87e313b7