import itertools
import random
-import traceback
+
+from twisted.python import log
from p2pool.util import math
from p2pool.bitcoin import data as bitcoin_data
def read(self, file):
values, file = bitcoin_data.ListType(self.inner).read(file)
if values != sorted(set(values)):
- raise ValueError("invalid values")
+ raise ValueError('invalid values')
references, file = bitcoin_data.ListType(bitcoin_data.VarIntType()).read(file)
return [values[reference] for reference in references], file
raise ValueError('invalid merkle_branch and other_txs')
merkle_branch = new_merkle_branch
+ if len(merkle_branch) > 16:
+ raise ValueError('merkle_branch too long!')
+
self.header = header
self.share_info = share_info
self.merkle_branch = merkle_branch
self.new_script = self.share_info['new_script']
self.subsidy = self.share_info['subsidy']
+ if len(self.new_script) > 100:
+ raise ValueError('new_script too long!')
+
self.previous_hash = self.previous_share_hash = self.share_data['previous_share_hash']
self.previous_shares_hash = self.share_data['previous_shares_hash']
self.target2 = self.share_data['target2']
+ self.nonce = self.share_data['nonce']
+
+ if len(self.nonce) > 20:
+ raise ValueError('nonce too long!')
self.hash = bitcoin_data.block_header_type.hash256(header)
if self.hash > self.target2:
- print "hash", hex(self.hash)
- print "targ", hex(self.target2)
+ print 'hash', hex(self.hash)
+ print 'targ', hex(self.target2)
raise ValueError('not enough work!')
if self.header['timestamp'] <= math.median((s.timestamp for s in itertools.islice(tracker.get_chain_to_root(self.previous_share_hash), 11)), use_float=False):
raise ValueError('share from too far in the past!')
+ # XXX use adjusted time
if self.header['timestamp'] > time.time() + 2*60*60:
raise ValueError('share from too far in the future!')
gentx = share_info_to_gentx(self.share_info, self.header['target'], tracker, net)
- if self.merkle_branch is not None:
- if check_merkle_branch(gentx, self.merkle_branch) != self.header['merkle_root']:
- raise ValueError("gentx doesn't match header via merkle_branch")
+ if check_merkle_branch(gentx, self.merkle_branch) != self.header['merkle_root']:
+ raise ValueError('''gentx doesn't match header via merkle_branch''')
if self.other_txs is not None:
if bitcoin_data.merkle_hash([gentx] + self.other_txs) != self.header['merkle_root']:
- raise ValueError("gentx doesn't match header via other_txs")
+ raise ValueError('''gentx doesn't match header via other_txs''')
self.gentx = gentx
pre_target2 = math.clip(pre_target, (previous_share2.target2*9//10, previous_share2.target2*11//10))
pre_target3 = math.clip(pre_target2, (0, 2**256//2**24 - 1))
target2 = bitcoin_data.FloatingIntegerType().truncate_to(pre_target3)
- print attempts_per_second//1000, "KHASH"
- #print "TARGET", 2**256//target2, 2**256/pre_target
- #print "ATT", bitcoin_data.target_to_average_attempts(target2)//1000
+ print attempts_per_second//1000, 'KHASH'
+ #print 'TARGET', 2**256//target2, 2**256/pre_target
+ #print 'ATT', bitcoin_data.target_to_average_attempts(target2)//1000
attempts_to_block = bitcoin_data.target_to_average_attempts(block_target)
-
-if __name__ == '__main__':
- class FakeShare(object):
- def __init__(self, hash, previous_share_hash):
- self.hash = hash
- self.previous_share_hash = previous_share_hash
-
- t = Tracker()
-
- t.add_share(FakeShare(1, 2))
- print t.heads, t.tails
- t.add_share(FakeShare(4, 0))
- print t.heads, t.tails
- t.add_share(FakeShare(3, 4))
- print t.heads, t.tails
- t.add_share(FakeShare(5, 0))
- print t.heads, t.tails
- t.add_share(FakeShare(0, 1))
- print t.heads, t.tails
-
- for share_hash in t.shares:
- print share_hash, t.get_height_and_last(share_hash)
-
class OkayTracker(bitcoin_data.Tracker):
def __init__(self, net):
bitcoin_data.Tracker.__init__(self)
self.net = net
self.verified = bitcoin_data.Tracker()
- """
+
self.okay_cache = {} # hash -> height
- def is_okay(self, start, _height_after=0):
- '''
- Returns:
- {'result': 'okay', verified_height: ...} # if share has an okay parent or if share has CHAIN_LENGTH children and CHAIN_LENTH parents that it verified with
- {'result': 'needs_share', 'share_hash': ...} # if share doesn't have CHAIN_LENGTH parents
- #{'result': 'needs_share_shares', 'share_hash': ...} # if share has CHAIN_LENGTH children and needs its shares to
- {'result': 'not_okay'} # if the share has a not okay parent or if the share has an okay parent and failed validation
- '''
-
- if start in self.okay_cache:
- return dict(result='okay', verified_height=self.okay_cache['start'])
-
- share = self.shares[start]
- if start not in self.shares:
- return dict(result='needs_share', share_hash=start)
-
- length = len
- to_end_rev = []
- for share in itertools.islice(self.get_chain(start), self.net.CHAIN_LENGTH):
- if share in self.okay_cache:
- return validate(share, to_end_rev[::-1])
- to_end_rev.append(share)
- # picking up last share from for loop, ew
- self.okay_cache.add(share)
- return validate(share, to_end_rev[::-1])
- """
def attempt_verify(self, share):
+ height, last = self.get_height_and_last(share.hash)
+ if height < self.net.CHAIN_LENGTH and last is not None:
+ raise AssertionError()
if share.hash in self.verified.shares:
return True
try:
share.check(self, self.net)
except:
print
- print "Share check failed:"
- traceback.print_exc()
+ print 'Share check failed:'
+ log.err()
print
return False
else:
self.verified.add(share)
return True
+
def think(self, ht):
desired = set()
+ # O(len(self.heads))
+ # make 'unverified heads' set?
# for each overall head, attempt verification
# if it fails, attempt on parent, and repeat
# if no successful verification because of lack of parents, request parent
for head in self.heads:
head_height, last = self.get_height_and_last(head)
- if head_height < self.net.CHAIN_LENGTH and last is not None:
- # request more
- print 1, hex(last)
- desired.add((self.shares[random.choice(list(self.reverse_shares[last]))].peer, last))
- continue
for share in itertools.islice(self.get_chain_known(head), None if last is None else head_height - self.net.CHAIN_LENGTH):
if self.attempt_verify(share):
break
-
- last = object
+ else:
+ desired.add((self.shares[random.choice(list(self.reverse_shares[last]))].peer, last))
# try to get at least CHAIN_LENGTH height for each verified head, requesting parents if needed
for head in self.verified.heads:
get = can
else:
get = want
- #print "Z", head_height, last_hash is None, last_height, last_last_hash is None, want, can, get
+ #print 'Z', head_height, last_hash is None, last_height, last_last_hash is None, want, can, get
for share in itertools.islice(self.get_chain_known(last_hash), get):
if not self.attempt_verify(share):
break
score2 = 0
attempts = 0
max_height = 0
- for share in itertools.islice(self.verified.get_chain_known(share_hash), self.net.CHAIN_LENGTH):
+ # XXX should only look past a certain share, not at recent ones
+ share2_hash = self.verified.get_nth_parent(share_hash, self.net.CHAIN_LENGTH//2)
+ for share in itertools.islice(self.verified.get_chain_known(share2_hash), self.net.CHAIN_LENGTH):
max_height = max(max_height, ht.get_min_height(share.header['previous_block']))
attempts += bitcoin_data.target_to_average_attempts(share.target2)
this_score = attempts//(ht.get_highest_height() - max_height + 1)
git://git.novaco.in / p2pool.git / blobdiff