import hashlib
import os
import random
+import sys
import time
from twisted.python import log
# shares
-# type:
-# 2: share1a
-# 3: share1b
-
share_type = pack.ComposedType([
('type', pack.VarIntType()),
('contents', pack.VarStrType()),
elif share['type'] == 5:
share1b = Share.share1b_type.unpack(share['contents'])
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'] == 8:
+ elif share['type'] == NewShare.VERSION:
return NewShare(net, peer, NewShare.share_type.unpack(share['contents']))
else:
raise ValueError('unknown share type: %r' % (share['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):
+ 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'])
return self.as_share1b()
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, 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_info invalid')
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([
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):
+ 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'])
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 = []
this = dict(share_count=i+1, tx_count=share.new_transaction_hashes.index(tx_hash))
break
else:
- if len(new_transaction_hashes) == 10: # only allow 10 new txns/share
- break
+ 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)
return 'Share' + repr((self.net, self.peer, self.contents))
def as_share(self):
- return dict(type=8, contents=self.share_type.pack(self.contents))
+ 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)
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 as_block(self, tracker, known_txs):
+ 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 dict(header=self.header, txs=[self.check(tracker)] + [known_txs[tx_hash] for tx_hash in other_tx_hashes])
+ 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):
#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].as_block(self, known_txs) is not 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:
if p2pool.DEBUG:
print 'Stale detected! %x < %x' % (best_share.header['previous_block'], previous_block)
best = best_share.previous_hash
- elif best_share.as_block(self, known_txs) is None:
+ 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
res = []
desired_version_counts = get_desired_version_counts(tracker, best_share,
- min(60*60//net.SHARE_PERIOD, tracker.get_height(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 > 5 and desired_version_counts[majority_desired_version] > sum(desired_version_counts.itervalues())/2:
+ 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())))
git://git.novaco.in / p2pool.git / blobdiff