fix user difficulty in username

[p2pool.git] / p2pool / work.py

diff --git a/p2pool/work.py b/p2pool/work.py
index d93a0c0..40a1a30 100644 (file)
--- a/p2pool/work.py
+++ b/p2pool/work.py
@@ -2,6 +2,7 @@ from __future__ import division
 
 import base64
 import random
+import re
 import sys
 import time
 
@@ -14,6 +15,8 @@ from util import forest, jsonrpc, variable, deferral, math, pack
 import p2pool, p2pool.data as p2pool_data
 
 class WorkerBridge(worker_interface.WorkerBridge):
+    COINBASE_NONCE_LENGTH = 4
+    
     def __init__(self, node, my_pubkey_hash, donation_percentage, merged_urls, worker_fee):
         worker_interface.WorkerBridge.__init__(self)
         self.recent_shares_ts_work = []
@@ -23,6 +26,7 @@ class WorkerBridge(worker_interface.WorkerBridge):
         self.donation_percentage = donation_percentage
         self.worker_fee = worker_fee
         
+        self.net = self.node.net.PARENT
         self.running = True
         self.pseudoshare_received = variable.Event()
         self.share_received = variable.Event()
@@ -131,22 +135,25 @@ class WorkerBridge(worker_interface.WorkerBridge):
         
         return (my_shares_not_in_chain - my_doa_shares_not_in_chain, my_doa_shares_not_in_chain), my_shares, (orphans_recorded_in_chain, doas_recorded_in_chain)
     
-    def get_user_details(self, user):
-        desired_pseudoshare_target = None
-        if '+' in user:
-            user, desired_pseudoshare_difficulty_str = user.rsplit('+', 1)
-            try:
-                desired_pseudoshare_target = bitcoin_data.difficulty_to_target(float(desired_pseudoshare_difficulty_str))
-            except:
-                pass
+    def get_user_details(self, username):
+        contents = re.split('([+/])', username)
+        assert len(contents) % 2 == 1
+        
+        user, contents2 = contents[0], contents[1:]
         
+        desired_pseudoshare_target = None
         desired_share_target = 2**256 - 1
-        if '/' in user:
-            user, min_diff_str = user.rsplit('/', 1)
-            try:
-                desired_share_target = bitcoin_data.difficulty_to_target(float(min_diff_str))
-            except:
-                pass
+        for symbol, parameter in zip(contents2[::2], contents2[1::2]):
+            if symbol == '+':
+                try:
+                    desired_pseudoshare_target = bitcoin_data.difficulty_to_target(float(parameter))
+                except:
+                    pass
+            elif symbol == '/':
+                try:
+                    desired_share_target = bitcoin_data.difficulty_to_target(float(parameter))
+                except:
+                    pass
         
         if random.uniform(0, 100) < self.worker_fee:
             pubkey_hash = self.my_pubkey_hash
@@ -223,7 +230,7 @@ class WorkerBridge(worker_interface.WorkerBridge):
                         'doa' if doas > doas_recorded_in_chain else
                         None
                     )(*self.get_stale_counts()),
-                    desired_version=share_type.SUCCESSOR.VERSION if share_type.SUCCESSOR is not None else share_type.VERSION,
+                    desired_version=(share_type.SUCCESSOR if share_type.SUCCESSOR is not None else share_type).VOTING_VERSION,
                 ),
                 block_target=self.current_work.value['bits'].target,
                 desired_timestamp=int(time.time() + 0.5),
@@ -277,9 +284,10 @@ class WorkerBridge(worker_interface.WorkerBridge):
         
         received_header_hashes = set()
         
-        def got_response(header, user, last_txout_nonce):
-            new_packed_gentx = packed_gentx[:-4-4] + pack.IntType(32).pack(last_txout_nonce) + packed_gentx[-4:] if last_txout_nonce != 0 else packed_gentx
-            new_gentx = bitcoin_data.tx_type.unpack(new_packed_gentx) if last_txout_nonce != 0 else gentx
+        def got_response(header, user, coinbase_nonce):
+            assert len(coinbase_nonce) == self.COINBASE_NONCE_LENGTH == 4
+            new_packed_gentx = packed_gentx[:-4-4] + coinbase_nonce + packed_gentx[-4:] if coinbase_nonce != '\0'*self.COINBASE_NONCE_LENGTH else packed_gentx
+            new_gentx = bitcoin_data.tx_type.unpack(new_packed_gentx) if coinbase_nonce != '\0'*self.COINBASE_NONCE_LENGTH else gentx
             
             header_hash = bitcoin_data.hash256(bitcoin_data.block_header_type.pack(header))
             pow_hash = self.node.net.PARENT.POW_FUNC(bitcoin_data.block_header_type.pack(header))
@@ -328,7 +336,7 @@ class WorkerBridge(worker_interface.WorkerBridge):
                     log.err(None, 'Error while processing merged mining POW:')
             
             if pow_hash <= share_info['bits'].target and header_hash not in received_header_hashes:
-                share = get_share(header, last_txout_nonce)
+                share = get_share(header, pack.IntType(32).unpack(coinbase_nonce))
                 
                 print 'GOT SHARE! %s %s prev %s age %.2fs%s' % (
                     user,