refactored p2pool node implementation from p2pool.main to p2pool.node. dedicated...
[p2pool.git] / p2pool / data.py
index a36fcd0..e24e90b 100644 (file)
@@ -3,6 +3,7 @@ from __future__ import division
 import hashlib
 import os
 import random
+import sys
 import time
 
 from twisted.python import log
@@ -33,24 +34,22 @@ def check_hash_link(hash_link, data, const_ending=''):
 
 # shares
 
-# type:
-# 2: share1a
-# 3: share1b
-
 share_type = pack.ComposedType([
     ('type', pack.VarIntType()),
     ('contents', pack.VarStrType()),
 ])
 
 def load_share(share, net, peer):
-    if share['type'] in [0, 1]:
+    if share['type'] in [0, 1, 2, 3]:
         from p2pool import p2p
         raise p2p.PeerMisbehavingError('sent an obsolete share')
-    elif share['type'] == 2:
+    elif share['type'] == 4:
         return Share(net, peer, other_txs=None, **Share.share1a_type.unpack(share['contents']))
-    elif share['type'] == 3:
+    elif share['type'] == 5:
         share1b = Share.share1b_type.unpack(share['contents'])
-        return Share(net, peer, merkle_branch=bitcoin_data.calculate_merkle_branch([0] + [bitcoin_data.hash256(bitcoin_data.tx_type.pack(x)) for x in share1b['other_txs']], 0), **share1b)
+        return Share(net, peer, merkle_link=bitcoin_data.calculate_merkle_link([0] + [bitcoin_data.hash256(bitcoin_data.tx_type.pack(x)) for x in share1b['other_txs']], 0), **share1b)
+    elif share['type'] == NewShare.VERSION:
+        return NewShare(net, peer, NewShare.share_type.unpack(share['contents']))
     else:
         raise ValueError('unknown share type: %r' % (share['type'],))
 
@@ -72,27 +71,36 @@ class Share(object):
         ('pubkey_hash', pack.IntType(160)),
         ('subsidy', pack.IntType(64)),
         ('donation', pack.IntType(16)),
-        ('stale_info', pack.IntType(8)), # 0 nothing, 253 orphan, 254 doa
+        ('stale_info', pack.EnumType(pack.IntType(8), dict((k, {0: None, 253: 'orphan', 254: 'doa'}.get(k, 'unk%i' % (k,))) for k in xrange(256)))),
+        ('desired_version', pack.VarIntType()),
     ])
     
     share_info_type = pack.ComposedType([
         ('share_data', share_data_type),
+        ('far_share_hash', pack.PossiblyNoneType(0, pack.IntType(256))),
         ('max_bits', bitcoin_data.FloatingIntegerType()),
         ('bits', bitcoin_data.FloatingIntegerType()),
         ('timestamp', pack.IntType(32)),
     ])
     
-    share1a_type = pack.ComposedType([
+    share_common_type = pack.ComposedType([
         ('min_header', small_block_header_type),
         ('share_info', share_info_type),
+        ('ref_merkle_link', pack.ComposedType([
+            ('branch', pack.ListType(pack.IntType(256))),
+            ('index', pack.VarIntType()),
+        ])),
         ('hash_link', hash_link_type),
-        ('merkle_branch', bitcoin_data.merkle_branch_type),
     ])
-    
+    share1a_type = pack.ComposedType([
+        ('common', share_common_type),
+        ('merkle_link', pack.ComposedType([
+            ('branch', pack.ListType(pack.IntType(256))),
+            ('index', pack.IntType(0)), # it will always be 0
+        ])),
+    ])
     share1b_type = pack.ComposedType([
-        ('min_header', small_block_header_type),
-        ('share_info', share_info_type),
-        ('hash_link', hash_link_type),
+        ('common', share_common_type),
         ('other_txs', pack.ListType(bitcoin_data.tx_type)),
     ])
     
@@ -104,8 +112,8 @@ class Share(object):
     gentx_before_refhash = pack.VarStrType().pack(DONATION_SCRIPT) + pack.IntType(64).pack(0) + pack.VarStrType().pack('\x20' + pack.IntType(256).pack(0))[:2]
     
     @classmethod
-    def generate_transaction(cls, tracker, share_data, block_target, desired_timestamp, desired_target, net):
-        previous_share = tracker.shares[share_data['previous_share_hash']] if share_data['previous_share_hash'] is not None else None
+    def generate_transaction(cls, tracker, share_data, block_target, desired_timestamp, desired_target, ref_merkle_link, desired_other_transaction_hashes, net, known_txs=None):
+        previous_share = tracker.items[share_data['previous_share_hash']] if share_data['previous_share_hash'] is not None else None
         
         height, last = tracker.get_height_and_last(share_data['previous_share_hash'])
         assert height >= net.REAL_CHAIN_LENGTH or last is None
@@ -122,7 +130,6 @@ class Share(object):
         weights, total_weight, donation_weight = tracker.get_cumulative_weights(share_data['previous_share_hash'],
             min(height, net.REAL_CHAIN_LENGTH),
             65535*net.SPREAD*bitcoin_data.target_to_average_attempts(block_target),
-            True,
         )
         assert total_weight == sum(weights.itervalues()) + donation_weight, (total_weight, sum(weights.itervalues()) + donation_weight)
         
@@ -138,6 +145,7 @@ class Share(object):
         
         share_info = dict(
             share_data=share_data,
+            far_share_hash=None if last is None and height < 99 else tracker.get_nth_parent_hash(share_data['previous_share_hash'], 99),
             max_bits=max_bits,
             bits=bits,
             timestamp=math.clip(desired_timestamp, (
@@ -146,44 +154,62 @@ class Share(object):
             )) if previous_share is not None else desired_timestamp,
         )
         
-        return share_info, dict(
+        gentx = dict(
             version=1,
             tx_ins=[dict(
                 previous_output=None,
                 sequence=None,
                 script=share_data['coinbase'].ljust(2, '\x00'),
             )],
-            tx_outs=[dict(value=amounts[script], script=script) for script in dests if amounts[script]] + [dict(
+            tx_outs=[dict(value=amounts[script], script=script) for script in dests if amounts[script] or script == DONATION_SCRIPT] + [dict(
                 value=0,
-                script='\x20' + pack.IntType(256).pack(bitcoin_data.hash256(cls.ref_type.pack(dict(
-                    identifier=net.IDENTIFIER,
-                    share_info=share_info,
-                )))),
+                script='\x20' + cls.get_ref_hash(net, share_info, ref_merkle_link),
             )],
             lock_time=0,
         )
+        
+        def get_share(header, transactions):
+            assert transactions[0] == gentx and [bitcoin_data.hash256(bitcoin_data.tx_type.pack(tx)) for tx in transactions[1:]] == desired_other_transaction_hashes
+            min_header = dict(header);del min_header['merkle_root']
+            hash_link = prefix_to_hash_link(bitcoin_data.tx_type.pack(gentx)[:-32-4], cls.gentx_before_refhash)
+            merkle_link = bitcoin_data.calculate_merkle_link([None] + desired_other_transaction_hashes, 0)
+            pow_hash = net.PARENT.POW_FUNC(bitcoin_data.block_header_type.pack(header))
+            return cls(net, None, dict(
+                min_header=min_header, share_info=share_info, hash_link=hash_link,
+                ref_merkle_link=dict(branch=[], index=0),
+            ), merkle_link=merkle_link, other_txs=transactions[1:] if pow_hash <= header['bits'].target else None)
+        
+        return share_info, gentx, desired_other_transaction_hashes, get_share
     
-    __slots__ = 'net min_header share_info hash_link merkle_branch other_txs hash share_data max_target target timestamp previous_hash new_script gentx_hash header pow_hash header_hash time_seen peer'.split(' ')
+    @classmethod
+    def get_ref_hash(cls, net, share_info, ref_merkle_link):
+        return pack.IntType(256).pack(bitcoin_data.check_merkle_link(bitcoin_data.hash256(cls.ref_type.pack(dict(
+            identifier=net.IDENTIFIER,
+            share_info=share_info,
+        ))), ref_merkle_link))
+    
+    __slots__ = 'net peer common min_header share_info hash_link merkle_link other_txs hash share_data max_target target timestamp previous_hash new_script desired_version gentx_hash header pow_hash header_hash new_transaction_hashes time_seen'.split(' ')
     
-    def __init__(self, net, peer, min_header, share_info, hash_link, merkle_branch, other_txs):
-        if len(share_info['share_data']['coinbase']) > 100:
-            raise ValueError('''coinbase too large! %i bytes''' % (len(self.share_data['coinbase']),))
+    def __init__(self, net, peer, common, merkle_link, other_txs):
+        self.net = net
+        self.peer = peer
+        self.common = common
+        self.min_header = common['min_header']
+        self.share_info = common['share_info']
+        self.hash_link = common['hash_link']
+        self.merkle_link = merkle_link
+        self.other_txs = other_txs
         
-        if len(merkle_branch) > 16:
-            raise ValueError('merkle_branch too long!')
+        if len(self.share_info['share_data']['coinbase']) > 100:
+            raise ValueError('''coinbase too large! %i bytes''' % (len(self.share_info['share_data']['coinbase']),))
         
-        if p2pool.DEBUG and other_txs is not None and bitcoin_data.calculate_merkle_branch([0] + [bitcoin_data.hash256(bitcoin_data.tx_type.pack(x)) for x in other_txs], 0) != merkle_branch:
-            raise ValueError('merkle_branch and other_txs do not match')
+        if len(merkle_link['branch']) > 16:
+            raise ValueError('merkle branch too long!')
         
-        assert not hash_link['extra_data'], repr(hash_link['extra_data'])
+        if p2pool.DEBUG and other_txs is not None and bitcoin_data.calculate_merkle_link([0] + [bitcoin_data.hash256(bitcoin_data.tx_type.pack(x)) for x in other_txs], 0) != merkle_link:
+            raise ValueError('merkle_link and other_txs do not match')
         
-        self.net = net
-        self.peer = peer
-        self.min_header = min_header
-        self.share_info = share_info
-        self.hash_link = hash_link
-        self.merkle_branch = merkle_branch
-        self.other_txs = other_txs
+        assert not self.hash_link['extra_data'], repr(self.hash_link['extra_data'])
         
         self.share_data = self.share_info['share_data']
         self.max_target = self.share_info['max_bits'].target
@@ -191,21 +217,20 @@ class Share(object):
         self.timestamp = self.share_info['timestamp']
         self.previous_hash = self.share_data['previous_share_hash']
         self.new_script = bitcoin_data.pubkey_hash_to_script2(self.share_data['pubkey_hash'])
+        self.desired_version = self.share_data['desired_version']
         
         self.gentx_hash = check_hash_link(
-            hash_link,
-            pack.IntType(256).pack(bitcoin_data.hash256(self.ref_type.pack(dict(
-                identifier=net.IDENTIFIER,
-                share_info=share_info,
-            )))) + pack.IntType(32).pack(0),
+            self.hash_link,
+            self.get_ref_hash(net, self.share_info, common['ref_merkle_link']) + pack.IntType(32).pack(0),
             self.gentx_before_refhash,
         )
-        merkle_root = bitcoin_data.check_merkle_branch(self.gentx_hash, 0, merkle_branch)
-        self.header = dict(min_header, merkle_root=merkle_root)
+        merkle_root = bitcoin_data.check_merkle_link(self.gentx_hash, merkle_link)
+        self.header = dict(self.min_header, merkle_root=merkle_root)
         self.pow_hash = net.PARENT.POW_FUNC(bitcoin_data.block_header_type.pack(self.header))
-        self.header_hash = bitcoin_data.hash256(bitcoin_data.block_header_type.pack(self.header))
+        self.hash = self.header_hash = bitcoin_data.hash256(bitcoin_data.block_header_type.pack(self.header))
         
         if self.pow_hash > self.target:
+            from p2pool import p2p
             raise p2p.PeerMisbehavingError('share PoW invalid')
         
         if other_txs is not None and not self.pow_hash <= self.header['bits'].target:
@@ -213,7 +238,7 @@ class Share(object):
         if other_txs is None and self.pow_hash <= self.header['bits'].target:
             raise ValueError('other_txs not provided when a block solution')
         
-        self.hash = bitcoin_data.hash256(share_type.pack(self.as_share()))
+        self.new_transaction_hashes = []
         
         # XXX eww
         self.time_seen = time.time()
@@ -221,56 +246,348 @@ class Share(object):
     def __repr__(self):
         return '<Share %s>' % (' '.join('%s=%r' % (k, getattr(self, k)) for k in self.__slots__),)
     
+    def as_share1a(self):
+        return dict(type=4, contents=self.share1a_type.pack(dict(common=self.common, merkle_link=self.merkle_link)))
+    
+    def as_share1b(self):
+        return dict(type=5, contents=self.share1b_type.pack(dict(common=self.common, other_txs=self.other_txs)))
+    
+    def as_share(self):
+        if not self.pow_hash <= self.header['bits'].target: # share1a
+            return self.as_share1a()
+        else:
+            return self.as_share1b()
+    
     def check(self, tracker):
-        share_info, gentx = self.generate_transaction(tracker, self.share_info['share_data'], self.header['bits'].target, self.share_info['timestamp'], self.share_info['bits'].target, self.net)
+        if self.share_data['previous_share_hash'] is not None:
+            previous_share = tracker.items[self.share_data['previous_share_hash']]
+            if isinstance(previous_share, NewShare):
+                from p2pool import p2p
+                raise p2p.PeerMisbehavingError('''Share can't follow NewShare''')
+        share_info, gentx, other_transaction_hashes, get_share = self.generate_transaction(tracker, self.share_info['share_data'], self.header['bits'].target, self.share_info['timestamp'], self.share_info['bits'].target, self.common['ref_merkle_link'], [], self.net) # ok because desired_other_transaction_hashes is only used in get_share
         if share_info != self.share_info:
-            raise ValueError('share difficulty invalid')
+            raise ValueError('share_info invalid')
         if bitcoin_data.hash256(bitcoin_data.tx_type.pack(gentx)) != self.gentx_hash:
             raise ValueError('''gentx doesn't match hash_link''')
+        return gentx # only used by as_block
     
-    def as_share(self):
-        if not self.pow_hash <= self.header['bits'].target: # share1a
-            return dict(type=2, contents=self.share1a_type.pack(dict(min_header=self.min_header, share_info=self.share_info, hash_link=self.hash_link, merkle_branch=self.merkle_branch)))
-        else: # share1b
-            return dict(type=3, contents=self.share1b_type.pack(dict(min_header=self.min_header, share_info=self.share_info, hash_link=self.hash_link, other_txs=self.other_txs)))
+    def get_other_tx_hashes(self, tracker):
+        return []
+    
+    def get_other_txs(self, tracker, known_txs):
+        return []
+    
+    def get_other_txs_size(self, tracker, known_txs):
+        return 0
+    
+    def get_new_txs_size(self, known_txs):
+        return 0
     
-    def as_block(self, tracker):
+    def as_block(self, tracker, known_txs):
         if self.other_txs is None:
             raise ValueError('share does not contain all txs')
+        return dict(header=self.header, txs=[self.check(tracker)] + self.other_txs)
+
+class NewShare(object):
+    VERSION = 8
+    
+    other_txs = None
+    
+    small_block_header_type = pack.ComposedType([
+        ('version', pack.VarIntType()),
+        ('previous_block', pack.PossiblyNoneType(0, pack.IntType(256))),
+        ('timestamp', pack.IntType(32)),
+        ('bits', bitcoin_data.FloatingIntegerType()),
+        ('nonce', pack.IntType(32)),
+    ])
+    
+    share_info_type = pack.ComposedType([
+        ('share_data', pack.ComposedType([
+            ('previous_share_hash', pack.PossiblyNoneType(0, pack.IntType(256))),
+            ('coinbase', pack.VarStrType()),
+            ('nonce', pack.IntType(32)),
+            ('pubkey_hash', pack.IntType(160)),
+            ('subsidy', pack.IntType(64)),
+            ('donation', pack.IntType(16)),
+            ('stale_info', pack.EnumType(pack.IntType(8), dict((k, {0: None, 253: 'orphan', 254: 'doa'}.get(k, 'unk%i' % (k,))) for k in xrange(256)))),
+            ('desired_version', pack.VarIntType()),
+        ])),
+        ('new_transaction_hashes', pack.ListType(pack.IntType(256))),
+        ('transaction_hash_refs', pack.ListType(pack.ComposedType([ # compressed by referencing previous shares' hashes
+            ('share_count', pack.VarIntType()),
+            ('tx_count', pack.VarIntType()),
+        ]))),
+        ('far_share_hash', pack.PossiblyNoneType(0, pack.IntType(256))),
+        ('max_bits', bitcoin_data.FloatingIntegerType()),
+        ('bits', bitcoin_data.FloatingIntegerType()),
+        ('timestamp', pack.IntType(32)),
+    ])
+    
+    share_type = pack.ComposedType([
+        ('min_header', small_block_header_type),
+        ('share_info', share_info_type),
+        ('ref_merkle_link', pack.ComposedType([
+            ('branch', pack.ListType(pack.IntType(256))),
+            ('index', pack.IntType(0)),
+        ])),
+        ('hash_link', hash_link_type),
+        ('merkle_link', pack.ComposedType([
+            ('branch', pack.ListType(pack.IntType(256))),
+            ('index', pack.IntType(0)), # it will always be 0
+        ])),
+    ])
+    
+    ref_type = pack.ComposedType([
+        ('identifier', pack.FixedStrType(64//8)),
+        ('share_info', share_info_type),
+    ])
+    
+    gentx_before_refhash = pack.VarStrType().pack(DONATION_SCRIPT) + pack.IntType(64).pack(0) + pack.VarStrType().pack('\x20' + pack.IntType(256).pack(0))[:2]
+    
+    @classmethod
+    def generate_transaction(cls, tracker, share_data, block_target, desired_timestamp, desired_target, ref_merkle_link, desired_other_transaction_hashes, net, known_txs=None):
+        previous_share = tracker.items[share_data['previous_share_hash']] if share_data['previous_share_hash'] is not None else None
+        
+        height, last = tracker.get_height_and_last(share_data['previous_share_hash'])
+        assert height >= net.REAL_CHAIN_LENGTH or last is None
+        if height < net.TARGET_LOOKBEHIND:
+            pre_target3 = net.MAX_TARGET
+        else:
+            attempts_per_second = get_pool_attempts_per_second(tracker, share_data['previous_share_hash'], net.TARGET_LOOKBEHIND, min_work=True, integer=True)
+            pre_target = 2**256//(net.SHARE_PERIOD*attempts_per_second) - 1 if attempts_per_second else 2**256-1
+            pre_target2 = math.clip(pre_target, (previous_share.max_target*9//10, previous_share.max_target*11//10))
+            pre_target3 = math.clip(pre_target2, (0, net.MAX_TARGET))
+        max_bits = bitcoin_data.FloatingInteger.from_target_upper_bound(pre_target3)
+        bits = bitcoin_data.FloatingInteger.from_target_upper_bound(math.clip(desired_target, (pre_target3//10, pre_target3)))
+        
+        weights, total_weight, donation_weight = tracker.get_cumulative_weights(share_data['previous_share_hash'],
+            min(height, net.REAL_CHAIN_LENGTH),
+            65535*net.SPREAD*bitcoin_data.target_to_average_attempts(block_target),
+        )
+        assert total_weight == sum(weights.itervalues()) + donation_weight, (total_weight, sum(weights.itervalues()) + donation_weight)
+        
+        amounts = dict((script, share_data['subsidy']*(199*weight)//(200*total_weight)) for script, weight in weights.iteritems()) # 99.5% goes according to weights prior to this share
+        this_script = bitcoin_data.pubkey_hash_to_script2(share_data['pubkey_hash'])
+        amounts[this_script] = amounts.get(this_script, 0) + share_data['subsidy']//200 # 0.5% goes to block finder
+        amounts[DONATION_SCRIPT] = amounts.get(DONATION_SCRIPT, 0) + share_data['subsidy'] - sum(amounts.itervalues()) # all that's left over is the donation weight and some extra satoshis due to rounding
+        
+        if sum(amounts.itervalues()) != share_data['subsidy'] or any(x < 0 for x in amounts.itervalues()):
+            raise ValueError()
+        
+        dests = sorted(amounts.iterkeys(), key=lambda script: (script == DONATION_SCRIPT, amounts[script], script))[-4000:] # block length limit, unlikely to ever be hit
+        
+        new_transaction_hashes = []
+        new_transaction_size = 0
+        transaction_hash_refs = []
+        other_transaction_hashes = []
+        
+        for tx_hash in desired_other_transaction_hashes:
+            for i, share in enumerate(tracker.get_chain(share_data['previous_share_hash'], min(height, 100))):
+                if tx_hash in share.new_transaction_hashes:
+                    this = dict(share_count=i+1, tx_count=share.new_transaction_hashes.index(tx_hash))
+                    break
+            else:
+                if known_txs is not None:
+                    this_size = len(bitcoin_data.tx_type.pack(known_txs[tx_hash]))
+                    if new_transaction_size + this_size > 50000: # only allow 50 kB of new txns/share
+                        break
+                    new_transaction_size += this_size
+                new_transaction_hashes.append(tx_hash)
+                this = dict(share_count=0, tx_count=len(new_transaction_hashes)-1)
+            transaction_hash_refs.append(this)
+            other_transaction_hashes.append(tx_hash)
+        
+        share_info = dict(
+            share_data=share_data,
+            far_share_hash=None if last is None and height < 99 else tracker.get_nth_parent_hash(share_data['previous_share_hash'], 99),
+            max_bits=max_bits,
+            bits=bits,
+            timestamp=math.clip(desired_timestamp, (
+                (previous_share.timestamp + net.SHARE_PERIOD) - (net.SHARE_PERIOD - 1), # = previous_share.timestamp + 1
+                (previous_share.timestamp + net.SHARE_PERIOD) + (net.SHARE_PERIOD - 1),
+            )) if previous_share is not None else desired_timestamp,
+            new_transaction_hashes=new_transaction_hashes,
+            transaction_hash_refs=transaction_hash_refs,
+        )
+        
+        gentx = dict(
+            version=1,
+            tx_ins=[dict(
+                previous_output=None,
+                sequence=None,
+                script=share_data['coinbase'],
+            )],
+            tx_outs=[dict(value=amounts[script], script=script) for script in dests if amounts[script] or script == DONATION_SCRIPT] + [dict(
+                value=0,
+                script='\x20' + cls.get_ref_hash(net, share_info, ref_merkle_link),
+            )],
+            lock_time=0,
+        )
+        
+        def get_share(header, transactions):
+            min_header=dict(header);del min_header['merkle_root']
+            return cls(net, None, dict(
+                min_header=min_header,
+                share_info=share_info,
+                ref_merkle_link=dict(branch=[], index=0),
+                hash_link=prefix_to_hash_link(bitcoin_data.tx_type.pack(gentx)[:-32-4], cls.gentx_before_refhash),
+                merkle_link=bitcoin_data.calculate_merkle_link([None] + other_transaction_hashes, 0),
+            ))
+        
+        return share_info, gentx, other_transaction_hashes, get_share
+    
+    @classmethod
+    def get_ref_hash(cls, net, share_info, ref_merkle_link):
+        return pack.IntType(256).pack(bitcoin_data.check_merkle_link(bitcoin_data.hash256(cls.ref_type.pack(dict(
+            identifier=net.IDENTIFIER,
+            share_info=share_info,
+        ))), ref_merkle_link))
+    
+    __slots__ = 'net peer contents min_header share_info hash_link merkle_link hash share_data max_target target timestamp previous_hash new_script desired_version gentx_hash header pow_hash header_hash new_transaction_hashes time_seen'.split(' ')
+    
+    def __init__(self, net, peer, contents):
+        self.net = net
+        self.peer = peer
+        self.contents = contents
+        
+        self.min_header = contents['min_header']
+        self.share_info = contents['share_info']
+        self.hash_link = contents['hash_link']
+        self.merkle_link = contents['merkle_link']
         
-        share_info, gentx = self.generate_transaction(tracker, self.share_info['share_data'], self.header['bits'].target, self.share_info['timestamp'], self.share_info['bits'].target, self.net)
-        assert share_info == self.share_info
+        if not (2 <= len(self.share_info['share_data']['coinbase']) <= 100):
+            raise ValueError('''bad coinbase size! %i bytes''' % (len(self.share_info['share_data']['coinbase']),))
         
-        return dict(header=self.header, txs=[gentx] + self.other_txs)
+        if len(self.merkle_link['branch']) > 16:
+            raise ValueError('merkle branch too long!')
+        
+        assert not self.hash_link['extra_data'], repr(self.hash_link['extra_data'])
+        
+        self.share_data = self.share_info['share_data']
+        self.max_target = self.share_info['max_bits'].target
+        self.target = self.share_info['bits'].target
+        self.timestamp = self.share_info['timestamp']
+        self.previous_hash = self.share_data['previous_share_hash']
+        self.new_script = bitcoin_data.pubkey_hash_to_script2(self.share_data['pubkey_hash'])
+        self.desired_version = self.share_data['desired_version']
+        
+        for x in self.share_info['transaction_hash_refs']:
+            assert x['share_count'] < 110
+        for i, x in enumerate(self.share_info['new_transaction_hashes']):
+            assert dict(share_count=0, tx_count=i) in self.share_info['transaction_hash_refs']
+        
+        self.gentx_hash = check_hash_link(
+            self.hash_link,
+            self.get_ref_hash(net, self.share_info, contents['ref_merkle_link']) + pack.IntType(32).pack(0),
+            self.gentx_before_refhash,
+        )
+        merkle_root = bitcoin_data.check_merkle_link(self.gentx_hash, self.merkle_link)
+        self.header = dict(self.min_header, merkle_root=merkle_root)
+        self.pow_hash = net.PARENT.POW_FUNC(bitcoin_data.block_header_type.pack(self.header))
+        self.hash = self.header_hash = bitcoin_data.hash256(bitcoin_data.block_header_type.pack(self.header))
+        
+        if self.target > net.MAX_TARGET:
+            from p2pool import p2p
+            raise p2p.PeerMisbehavingError('share target invalid')
+        
+        if self.pow_hash > self.target:
+            from p2pool import p2p
+            raise p2p.PeerMisbehavingError('share PoW invalid')
+        
+        self.new_transaction_hashes = self.share_info['new_transaction_hashes']
+        
+        # XXX eww
+        self.time_seen = time.time()
+    
+    def __repr__(self):
+        return 'Share' + repr((self.net, self.peer, self.contents))
+    
+    def as_share(self):
+        return dict(type=self.VERSION, contents=self.share_type.pack(self.contents))
+    
+    def check(self, tracker):
+        if self.share_data['previous_share_hash'] is not None:
+            previous_share = tracker.items[self.share_data['previous_share_hash']]
+            if isinstance(previous_share, Share):
+                if tracker.get_height(previous_share.hash) < self.net.CHAIN_LENGTH:
+                    from p2pool import p2p
+                    raise p2p.PeerMisbehavingError('NewShare without enough history')
+                else:
+                    # Share -> NewShare only valid if 85% of hashes in [self.net.CHAIN_LENGTH*9//10, self.net.CHAIN_LENGTH] for new version
+                    counts = get_desired_version_counts(tracker,
+                        tracker.get_nth_parent_hash(previous_share.hash, self.net.CHAIN_LENGTH*9//10), self.net.CHAIN_LENGTH//10)
+                    if counts.get(self.VERSION, 0) < sum(counts.itervalues())*85//100:
+                        from p2pool import p2p
+                        raise p2p.PeerMisbehavingError('NewShare without enough hash power upgraded')
+        
+        other_tx_hashes = [tracker.items[tracker.get_nth_parent_hash(self.hash, x['share_count'])].share_info['new_transaction_hashes'][x['tx_count']] for x in self.share_info['transaction_hash_refs']]
+        
+        share_info, gentx, other_tx_hashes2, get_share = self.generate_transaction(tracker, self.share_info['share_data'], self.header['bits'].target, self.share_info['timestamp'], self.share_info['bits'].target, self.contents['ref_merkle_link'], other_tx_hashes, self.net)
+        assert other_tx_hashes2 == other_tx_hashes
+        if share_info != self.share_info:
+            raise ValueError('share_info invalid')
+        if bitcoin_data.hash256(bitcoin_data.tx_type.pack(gentx)) != self.gentx_hash:
+            raise ValueError('''gentx doesn't match hash_link''')
+        
+        if bitcoin_data.calculate_merkle_link([None] + other_tx_hashes, 0) != self.merkle_link:
+            raise ValueError('merkle_link and other_tx_hashes do not match')
+        
+        return gentx # only used by as_block
+    
+    def get_other_tx_hashes(self, tracker):
+        return [tracker.items[tracker.get_nth_parent_hash(self.hash, x['share_count'])].share_info['new_transaction_hashes'][x['tx_count']] for x in self.share_info['transaction_hash_refs']]
+    
+    def get_other_txs(self, tracker, known_txs):
+        other_tx_hashes = self.get_other_tx_hashes(tracker)
+        
+        if not all(tx_hash in known_txs for tx_hash in other_tx_hashes):
+            return None # not all txs present
+        
+        return [known_txs[tx_hash] for tx_hash in other_tx_hashes]
+    
+    def get_other_txs_size(self, tracker, known_txs):
+        other_txs = self.get_other_txs(tracker, known_txs)
+        if other_txs is None:
+            return None # not all txs present
+        size = sum(len(bitcoin_data.tx_type.pack(tx)) for tx in other_txs)
+    
+    def get_new_txs_size(self, known_txs):
+        if not all(tx_hash in known_txs for tx_hash in self.share_info['new_transaction_hashes']):
+            return None # not all txs present
+        return sum(len(bitcoin_data.tx_type.pack(known_txs[tx_hash])) for tx_hash in self.share_info['new_transaction_hashes'])
+    
+    def as_block(self, tracker, known_txs):
+        other_txs = self.get_other_txs(tracker, known_txs)
+        if other_txs is None:
+            return None # not all txs present
+        return dict(header=self.header, txs=[self.check(tracker)] + other_txs)
+
 
 class WeightsSkipList(forest.TrackerSkipList):
     # share_count, weights, total_weight
     
     def get_delta(self, element):
         from p2pool.bitcoin import data as bitcoin_data
-        share = self.tracker.shares[element]
+        share = self.tracker.items[element]
         att = bitcoin_data.target_to_average_attempts(share.target)
         return 1, {share.new_script: att*(65535-share.share_data['donation'])}, att*65535, att*share.share_data['donation']
     
     def combine_deltas(self, (share_count1, weights1, total_weight1, total_donation_weight1), (share_count2, weights2, total_weight2, total_donation_weight2)):
         return share_count1 + share_count2, math.add_dicts(weights1, weights2), total_weight1 + total_weight2, total_donation_weight1 + total_donation_weight2
     
-    def initial_solution(self, start, (max_shares, desired_weight, broken_mode)):
+    def initial_solution(self, start, (max_shares, desired_weight)):
         assert desired_weight % 65535 == 0, divmod(desired_weight, 65535)
         return 0, None, 0, 0
     
-    def apply_delta(self, (share_count1, weights_list, total_weight1, total_donation_weight1), (share_count2, weights2, total_weight2, total_donation_weight2), (max_shares, desired_weight, broken_mode)):
+    def apply_delta(self, (share_count1, weights_list, 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 share_count2 == 1:
             assert (desired_weight - total_weight1) % 65535 == 0
             script, = weights2.iterkeys()
-            if broken_mode:
-                new_weights = dict(script=(desired_weight - total_weight1)//65535*weights2[script]//(total_weight2//65535))
-            else:
-                new_weights = {script: (desired_weight - total_weight1)//65535*weights2[script]//(total_weight2//65535)}
+            new_weights = {script: (desired_weight - total_weight1)//65535*weights2[script]//(total_weight2//65535)}
             return share_count1 + share_count2, (weights_list, new_weights), desired_weight, total_donation_weight1 + (desired_weight - total_weight1)//65535*total_donation_weight2//(total_weight2//65535)
         return share_count1 + share_count2, (weights_list, weights2), total_weight1 + total_weight2, total_donation_weight1 + total_donation_weight2
     
-    def judge(self, (share_count, weights_list, total_weight, total_donation_weight), (max_shares, desired_weight, broken_mode)):
+    def judge(self, (share_count, weights_list, total_weight, total_donation_weight), (max_shares, desired_weight)):
         if share_count > max_shares or total_weight > desired_weight:
             return 1
         elif share_count == max_shares or total_weight == desired_weight:
@@ -278,31 +595,25 @@ class WeightsSkipList(forest.TrackerSkipList):
         else:
             return -1
     
-    def finalize(self, (share_count, weights_list, total_weight, total_donation_weight), (max_shares, desired_weight, broken_mode)):
+    def finalize(self, (share_count, weights_list, total_weight, total_donation_weight), (max_shares, desired_weight)):
         assert share_count <= max_shares and total_weight <= desired_weight
         assert share_count == max_shares or total_weight == desired_weight
         return math.add_dicts(*math.flatten_linked_list(weights_list)), total_weight, total_donation_weight
 
 class OkayTracker(forest.Tracker):
-    def __init__(self, net, my_share_hashes, my_doa_share_hashes):
+    def __init__(self, net):
         forest.Tracker.__init__(self, delta_type=forest.get_attributedelta_type(dict(forest.AttributeDelta.attrs,
             work=lambda share: bitcoin_data.target_to_average_attempts(share.target),
             min_work=lambda share: bitcoin_data.target_to_average_attempts(share.max_target),
         )))
         self.net = net
-        self.verified = forest.Tracker(delta_type=forest.get_attributedelta_type(dict(forest.AttributeDelta.attrs,
+        self.verified = forest.SubsetTracker(delta_type=forest.get_attributedelta_type(dict(forest.AttributeDelta.attrs,
             work=lambda share: bitcoin_data.target_to_average_attempts(share.target),
-            my_count=lambda share: 1 if share.hash in my_share_hashes else 0,
-            my_doa_count=lambda share: 1 if share.hash in my_doa_share_hashes else 0,
-            my_orphan_announce_count=lambda share: 1 if share.hash in my_share_hashes and share.share_data['stale_info'] == 253 else 0,
-            my_dead_announce_count=lambda share: 1 if share.hash in my_share_hashes and share.share_data['stale_info'] == 254 else 0,
-        )))
-        self.verified.get_nth_parent_hash = self.get_nth_parent_hash # self is a superset of self.verified
-        
+        )), subset_of=self)
         self.get_cumulative_weights = WeightsSkipList(self)
     
     def attempt_verify(self, share):
-        if share.hash in self.verified.shares:
+        if share.hash in self.verified.items:
             return True
         height, last = self.get_height_and_last(share.hash)
         if height < self.net.CHAIN_LENGTH + 1 and last is not None:
@@ -316,7 +627,7 @@ class OkayTracker(forest.Tracker):
             self.verified.add(share)
             return True
     
-    def think(self, block_rel_height_func, previous_block, bits):
+    def think(self, block_rel_height_func, previous_block, bits, known_txs):
         desired = set()
         
         # O(len(self.heads))
@@ -336,13 +647,13 @@ class OkayTracker(forest.Tracker):
             else:
                 if last is not None:
                     desired.add((
-                        self.shares[random.choice(list(self.reverse_shares[last]))].peer,
+                        self.items[random.choice(list(self.reverse[last]))].peer,
                         last,
                         max(x.timestamp for x in self.get_chain(head, min(head_height, 5))),
                         min(x.target for x in self.get_chain(head, min(head_height, 5))),
                     ))
         for bad in bads:
-            assert bad not in self.verified.shares
+            assert bad not in self.verified.items
             assert bad in self.heads
             if p2pool.DEBUG:
                 print "BAD", bad
@@ -362,7 +673,7 @@ class OkayTracker(forest.Tracker):
                     break
             if head_height < self.net.CHAIN_LENGTH and last_last_hash is not None:
                 desired.add((
-                    self.shares[random.choice(list(self.verified.reverse_shares[last_hash]))].peer,
+                    self.items[random.choice(list(self.verified.reverse[last_hash]))].peer,
                     last_last_hash,
                     max(x.timestamp for x in self.get_chain(head, min(head_height, 5))),
                     min(x.target for x in self.get_chain(head, min(head_height, 5))),
@@ -379,15 +690,18 @@ class OkayTracker(forest.Tracker):
         # decide best verified head
         decorated_heads = sorted(((
             self.verified.get_work(self.verified.get_nth_parent_hash(h, min(5, self.verified.get_height(h)))),
-            #self.shares[h].peer is None,
-            self.shares[h].pow_hash <= self.shares[h].header['bits'].target, # is block solution
-            (self.shares[h].header['previous_block'], self.shares[h].header['bits']) == (previous_block, bits) or self.shares[h].peer is None,
-            -self.shares[h].time_seen,
+            #self.items[h].peer is None,
+            self.items[h].pow_hash <= self.items[h].header['bits'].target, # is block solution
+            (self.items[h].header['previous_block'], self.items[h].header['bits']) == (previous_block, bits) or self.items[h].peer is None,
+            self.items[h].get_other_txs(self, known_txs) is not None,
+            self.items[h].get_other_txs_size(self, known_txs) < 1000000,
+            self.items[h].get_new_txs_size(known_txs) < 50000,
+            -self.items[h].time_seen,
         ), h) for h in self.verified.tails.get(best_tail, []))
         if p2pool.DEBUG:
             print len(decorated_heads), 'heads. Top 10:'
             for score, head_hash in decorated_heads[-10:]:
-                print '   ', format_hash(head_hash), format_hash(self.shares[head_hash].previous_hash), score
+                print '   ', format_hash(head_hash), format_hash(self.items[head_hash].previous_hash), score
         best_head_score, best = decorated_heads[-1] if decorated_heads else (None, None)
         
         # eat away at heads
@@ -398,19 +712,19 @@ class OkayTracker(forest.Tracker):
                     if share_hash in [head_hash for score, head_hash in decorated_heads[-5:]]:
                         #print 1
                         continue
-                    if self.shares[share_hash].time_seen > time.time() - 300:
+                    if self.items[share_hash].time_seen > time.time() - 300:
                         #print 2
                         continue
-                    if share_hash not in self.verified.shares and max(self.shares[after_tail_hash].time_seen for after_tail_hash in self.reverse_shares.get(tail)) > time.time() - 120: # XXX stupid
+                    if share_hash not in self.verified.items and max(self.items[after_tail_hash].time_seen for after_tail_hash in self.reverse.get(tail)) > time.time() - 120: # XXX stupid
                         #print 3
                         continue
                     to_remove.add(share_hash)
                 if not to_remove:
                     break
                 for share_hash in to_remove:
-                    self.remove(share_hash)
-                    if share_hash in self.verified.shares:
+                    if share_hash in self.verified.items:
                         self.verified.remove(share_hash)
+                    self.remove(share_hash)
                 #print "_________", to_remove
         
         # drop tails
@@ -419,8 +733,8 @@ class OkayTracker(forest.Tracker):
             for tail, heads in self.tails.iteritems():
                 if min(self.get_height(head) for head in heads) < 2*self.net.CHAIN_LENGTH + 10:
                     continue
-                for aftertail in self.reverse_shares.get(tail, set()):
-                    if len(self.reverse_shares[self.shares[aftertail].previous_hash]) > 1: # XXX
+                for aftertail in self.reverse.get(tail, set()):
+                    if len(self.reverse[self.items[aftertail].previous_hash]) > 1: # XXX
                         print "raw"
                         continue
                     to_remove.add(aftertail)
@@ -429,21 +743,30 @@ class OkayTracker(forest.Tracker):
             # if removed from this, it must be removed from verified
             #start = time.time()
             for aftertail in to_remove:
-                if self.shares[aftertail].previous_hash not in self.tails:
-                    print "erk", aftertail, self.shares[aftertail].previous_hash
+                if self.items[aftertail].previous_hash not in self.tails:
+                    print "erk", aftertail, self.items[aftertail].previous_hash
                     continue
-                self.remove(aftertail)
-                if aftertail in self.verified.shares:
+                if aftertail in self.verified.items:
                     self.verified.remove(aftertail)
+                self.remove(aftertail)
             #end = time.time()
             #print "removed! %i %f" % (len(to_remove), (end - start)/len(to_remove))
         
         if best is not None:
-            best_share = self.shares[best]
+            best_share = self.items[best]
             if (best_share.header['previous_block'], best_share.header['bits']) != (previous_block, bits) and best_share.header_hash != previous_block and best_share.peer is not None:
                 if p2pool.DEBUG:
                     print 'Stale detected! %x < %x' % (best_share.header['previous_block'], previous_block)
                 best = best_share.previous_hash
+            elif best_share.get_other_txs(self, known_txs) is None:
+                print 'Share with incomplete transactions detected! Jumping from %s to %s!' % (format_hash(best), format_hash(best_share.previous_hash))
+                best = best_share.previous_hash
+            elif best_share.get_other_txs_size(self, known_txs) > 1000000:
+                print >>sys.stderr, 'Share with too many transactions detected! Jumping from %s to %s!' % (format_hash(best), format_hash(best_share.previous_hash))
+                best = best_share.previous_hash
+            elif best_share.get_new_txs_size(known_txs) > 50000:
+                print >>sys.stderr, 'Share with too many new transactions detected! Jumping from %s to %s!' % (format_hash(best), format_hash(best_share.previous_hash))
+                best = best_share.previous_hash
             
             timestamp_cutoff = min(int(time.time()), best_share.timestamp) - 3600
             target_cutoff = 2**256//(self.net.SHARE_PERIOD*best_tail_score[1] + 1) * 2 if best_tail_score[1] is not None else 2**256-1
@@ -456,7 +779,7 @@ class OkayTracker(forest.Tracker):
             for peer, hash, ts, targ in desired:
                 print '   ', '%s:%i' % peer.addr if peer is not None else None, format_hash(hash), math.format_dt(time.time() - ts), bitcoin_data.target_to_difficulty(targ), ts >= timestamp_cutoff, targ <= target_cutoff
         
-        return best, [(peer, hash) for peer, hash, ts, targ in desired if ts >= timestamp_cutoff and targ <= target_cutoff]
+        return best, [(peer, hash) for peer, hash, ts, targ in desired if ts >= timestamp_cutoff]
     
     def score(self, share_hash, block_rel_height_func):
         # returns approximate lower bound on chain's hashrate in the last self.net.CHAIN_LENGTH*15//16*self.net.SHARE_PERIOD time
@@ -470,13 +793,13 @@ class OkayTracker(forest.Tracker):
         block_height = max(block_rel_height_func(share.header['previous_block']) for share in
             self.verified.get_chain(end_point, self.net.CHAIN_LENGTH//16))
         
-        return self.net.CHAIN_LENGTH, (self.verified.get_work(share_hash) - self.verified.get_work(end_point))//((0 - block_height + 1)*self.net.PARENT.BLOCK_PERIOD)
+        return self.net.CHAIN_LENGTH, self.verified.get_delta(share_hash, end_point).work//((0 - block_height + 1)*self.net.PARENT.BLOCK_PERIOD)
 
 def get_pool_attempts_per_second(tracker, previous_share_hash, dist, min_work=False, integer=False):
     assert dist >= 2
-    near = tracker.shares[previous_share_hash]
-    far = tracker.shares[tracker.get_nth_parent_hash(previous_share_hash, dist - 1)]
-    attempts = tracker.get_work(near.hash) - tracker.get_work(far.hash) if not min_work else tracker.get_delta(near.hash).min_work - tracker.get_delta(far.hash).min_work
+    near = tracker.items[previous_share_hash]
+    far = tracker.items[tracker.get_nth_parent_hash(previous_share_hash, dist - 1)]
+    attempts = tracker.get_delta(near.hash, far.hash).work if not min_work else tracker.get_delta(near.hash, far.hash).min_work
     time = near.timestamp - far.timestamp
     if time <= 0:
         time = 1
@@ -485,15 +808,63 @@ def get_pool_attempts_per_second(tracker, previous_share_hash, dist, min_work=Fa
     return attempts/time
 
 def get_average_stale_prop(tracker, share_hash, lookbehind):
-    stales = sum(1 for share in tracker.get_chain(share_hash, lookbehind) if share.share_data['stale_info'] != 0)
+    stales = sum(1 for share in tracker.get_chain(share_hash, lookbehind) if share.share_data['stale_info'] is not None)
     return stales/(lookbehind + stales)
 
+def get_stale_counts(tracker, share_hash, lookbehind, rates=False):
+    res = {}
+    for share in tracker.get_chain(share_hash, lookbehind - 1):
+        res['good'] = res.get('good', 0) + bitcoin_data.target_to_average_attempts(share.target)
+        s = share.share_data['stale_info']
+        if s is not None:
+            res[s] = res.get(s, 0) + bitcoin_data.target_to_average_attempts(share.target)
+    if rates:
+        dt = tracker.items[share_hash].timestamp - tracker.items[tracker.get_nth_parent_hash(share_hash, lookbehind - 1)].timestamp
+        res = dict((k, v/dt) for k, v in res.iteritems())
+    return res
+
+def get_user_stale_props(tracker, share_hash, lookbehind):
+    res = {}
+    for share in tracker.get_chain(share_hash, lookbehind - 1):
+        stale, total = res.get(share.share_data['pubkey_hash'], (0, 0))
+        total += 1
+        if share.share_data['stale_info'] is not None:
+            stale += 1
+            total += 1
+        res[share.share_data['pubkey_hash']] = stale, total
+    return dict((pubkey_hash, stale/total) for pubkey_hash, (stale, total) in res.iteritems())
+
 def get_expected_payouts(tracker, best_share_hash, block_target, subsidy, net):
-    weights, total_weight, donation_weight = tracker.get_cumulative_weights(best_share_hash, min(tracker.get_height(best_share_hash), net.REAL_CHAIN_LENGTH), 65535*net.SPREAD*bitcoin_data.target_to_average_attempts(block_target), False)
+    weights, total_weight, donation_weight = tracker.get_cumulative_weights(best_share_hash, min(tracker.get_height(best_share_hash), net.REAL_CHAIN_LENGTH), 65535*net.SPREAD*bitcoin_data.target_to_average_attempts(block_target))
     res = dict((script, subsidy*weight//total_weight) for script, weight in weights.iteritems())
     res[DONATION_SCRIPT] = res.get(DONATION_SCRIPT, 0) + subsidy - sum(res.itervalues())
     return res
 
+def get_desired_version_counts(tracker, best_share_hash, dist):
+    res = {}
+    for share in tracker.get_chain(best_share_hash, dist):
+        res[share.desired_version] = res.get(share.desired_version, 0) + bitcoin_data.target_to_average_attempts(share.target)
+    return res
+
+def get_warnings(tracker, best_share, net, bitcoind_warning, bitcoind_work_value):
+    res = []
+    
+    desired_version_counts = get_desired_version_counts(tracker, best_share,
+        min(net.CHAIN_LENGTH, 60*60//net.SHARE_PERIOD, tracker.get_height(best_share)))
+    majority_desired_version = max(desired_version_counts, key=lambda k: desired_version_counts[k])
+    if majority_desired_version > NewShare.VERSION and desired_version_counts[majority_desired_version] > sum(desired_version_counts.itervalues())/2:
+        res.append('A MAJORITY OF SHARES CONTAIN A VOTE FOR AN UNSUPPORTED SHARE IMPLEMENTATION! (v%i with %i%% support)\n'
+            'An upgrade is likely necessary. Check http://p2pool.forre.st/ for more information.' % (
+                majority_desired_version, 100*desired_version_counts[majority_desired_version]/sum(desired_version_counts.itervalues())))
+    
+    if bitcoind_warning is not None:
+        res.append('(from bitcoind) %s' % (bitcoind_warning,))
+    
+    if time.time() > bitcoind_work_value['last_update'] + 60:
+        res.append('''LOST CONTACT WITH BITCOIND for %s! Check that it isn't frozen or dead!''' % (math.format_dt(time.time() - bitcoind_work_value['last_update']),))
+    
+    return res
+
 def format_hash(x):
     if x is None:
         return 'xxxxxxxx'
@@ -530,7 +901,7 @@ class ShareStore(object):
                             verified_hashes.add(verified_hash)
                         elif type_id == 5:
                             raw_share = share_type.unpack(data_hex.decode('hex'))
-                            if raw_share['type'] in [0, 1]:
+                            if raw_share['type'] in [0, 1, 2, 3, 6, 7]:
                                 continue
                             share = load_share(raw_share, self.net, None)
                             yield 'share', share
@@ -538,7 +909,7 @@ class ShareStore(object):
                         else:
                             raise NotImplementedError("share type %i" % (type_id,))
                     except Exception:
-                        log.err(None, "Error while reading saved shares, continuing where left off:")
+                        log.err(None, "HARMLESS error while reading saved shares, continuing where left off:")
         self.known = known
         self.known_desired = dict((k, (set(a), set(b))) for k, (a, b) in known.iteritems())