DONATION_SCRIPT = '4104ffd03de44a6e11b9917f3a29f9443283d9871c9d743ef30d5eddcd37094b64d1b3d8090496b53256786bf5c82932ec23c3b74d9f05a6f95a8b5529352656664bac'.decode('hex')
class Share(object):
+ VERSION = 7
+ SUCCESSOR = None
+
small_block_header_type = pack.ComposedType([
('version', pack.VarIntType()), # XXX must be constrained to 32 bits
('previous_block', pack.PossiblyNoneType(0, pack.IntType(256))),
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))
+ pre_target3 = math.clip(pre_target2, (net.MIN_TARGET, 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)))
return self.as_share1b()
def check(self, tracker):
+ from p2pool import p2p
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''')
+ if type(self) is type(previous_share):
+ pass
+ elif type(self) is type(previous_share).SUCCESSOR:
+ if tracker.get_height(previous_share.hash) < self.net.CHAIN_LENGTH:
+ from p2pool import p2p
+ raise p2p.PeerMisbehavingError('switch without enough history')
+
+ # switch 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:
+ raise p2p.PeerMisbehavingError('switch without enough hash power upgraded')
+ else:
+ raise p2p.PeerMisbehavingError('''%s can't follow %s''' % (type(self).__name__, type(previous_share).__name__))
+
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')
class NewShare(object):
VERSION = 8
+ SUCCESSOR = None
other_txs = None
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))
+ pre_target3 = math.clip(pre_target2, (net.MIN_TARGET, 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)))
break
else:
if known_txs is not None:
- this_size = len(bitcoin_data.tx_type.pack(known_txs[tx_hash]))
+ this_size = bitcoin_data.tx_type.packed_size(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
return dict(type=self.VERSION, contents=self.share_type.pack(self.contents))
def check(self, tracker):
+ from p2pool import p2p
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 type(self) is type(previous_share):
+ pass
+ elif type(self) is type(previous_share).SUCCESSOR:
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')
+ raise p2p.PeerMisbehavingError('switch without enough history')
+
+ # switch 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:
+ raise p2p.PeerMisbehavingError('switch without enough hash power upgraded')
+ else:
+ raise p2p.PeerMisbehavingError('''%s can't follow %s''' % (type(self).__name__, type(previous_share).__name__))
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']]
other_txs = self._get_other_txs(tracker, known_txs)
if other_txs is None:
return True, 'not all txs present'
-
- all_txs_size = sum(len(bitcoin_data.tx_type.pack(tx)) for tx in other_txs)
- if all_txs_size > 1000000:
- return True, 'txs over block size limit'
-
- new_txs_size = sum(len(bitcoin_data.tx_type.pack(known_txs[tx_hash])) for tx_hash in self.share_info['new_transaction_hashes'])
- if new_txs_size > 50000:
- return True, 'new txs over limit'
+ else:
+ all_txs_size = sum(bitcoin_data.tx_type.packed_size(tx) for tx in other_txs)
+ if all_txs_size > 1000000:
+ return True, 'txs over block size limit'
+
+ new_txs_size = sum(bitcoin_data.tx_type.packed_size(known_txs[tx_hash]) for tx_hash in self.share_info['new_transaction_hashes'])
+ if new_txs_size > 50000:
+ return True, 'new txs over limit'
return False, None
best_share = self.items[best]
punish, punish_reason = best_share.should_punish_reason(previous_block, bits, self, known_txs)
if punish > 0:
- if p2pool.DEBUG:
- print >>sys.stderr, 'Punishing share for %r! Jumping from %s to %s!' % (punish_reason, format_hash(best), format_hash(best_share.previous_hash))
+ print 'Punishing share for %r! Jumping from %s to %s!' % (punish_reason, format_hash(best), format_hash(best_share.previous_hash))
best = best_share.previous_hash
timestamp_cutoff = min(int(time.time()), best_share.timestamp) - 3600