fixed several bugs

diff --git a/p2pool/data.py b/p2pool/data.py
index 50ee991..758532b 100644 (file)
--- a/p2pool/data.py
+++ b/p2pool/data.py
@@ -350,6 +350,15 @@ class NewShare(Share):
             
             if len(bitcoin_data.block_type.pack(dict(header=self.header, txs=[gentx] + self.other_txs))) > 1000000 - 1000:
                 raise ValueError('block size too large')
+    
+    def as_block(self, tracker, net):
+        if self.other_txs is None:
+            raise ValueError('share does not contain all txs')
+        
+        share_info, gentx = new_generate_transaction(tracker, self.share_info['new_share_data'], self.header['target'], net)
+        assert share_info == self.share_info
+        
+        return dict(header=self.header, txs=[gentx] + self.other_txs)
 
 def get_pool_attempts_per_second(tracker, previous_share_hash, net, dist=None):
     if dist is None:

diff --git a/p2pool/skiplists.py b/p2pool/skiplists.py
index 8efdad3..b749119 100644 (file)
--- a/p2pool/skiplists.py
+++ b/p2pool/skiplists.py
@@ -26,10 +26,10 @@ class WeightsSkipList(skiplist.SkipList):
         return 0, {}, 0, 0
     
     def apply_delta(self, (share_count1, weights1, total_weight1, total_donation_weight1), (share_count2, weights2, total_weight2, total_donation_weight2), (max_shares, desired_weight)):
-        if total_weight1 + total_weight2 > desired_weight and len(share_count2) == 1:
+        if total_weight1 + total_weight2 > desired_weight and share_count2 == 1:
             script, = weights2.iterkeys()
             new_weights = dict(weights1)
-            assert desired_weight - total_weight1 % 65535 == 0
+            assert (desired_weight - total_weight1) % 65535 == 0
             new_weights[script] = new_weights.get(script, 0) + (desired_weight - total_weight1)//65535*weights2[script]//(total_weight2//65535)
             return share_count1 + share_count2, new_weights, desired_weight, total_donation_weight1 + (desired_weight - total_weight1)//65535*total_donation_weight2//(total_weight2//65535)
         return share_count1 + share_count2, math.add_dicts([weights1, weights2]), total_weight1 + total_weight2, total_donation_weight1 + total_donation_weight2