# 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'] == 6:
+ return NewShare(net, peer, other_txs=None, **NewShare.share1a_type.unpack(share['contents']))
+ elif share['type'] == 7:
+ share1b = NewShare.share1b_type.unpack(share['contents'])
+ return NewShare(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)
else:
raise ValueError('unknown share type: %r' % (share['type'],))
('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()),
])
self.new_script = bitcoin_data.pubkey_hash_to_script2(self.share_data['pubkey_hash'])
self.desired_version = self.share_data['desired_version']
- if self.timestamp < net.SWITCH_TIME:
- from p2pool import p2p
- raise p2p.PeerMisbehavingError('peer sent a new-style share with a timestamp before the switch time')
-
self.gentx_hash = check_hash_link(
self.hash_link,
self.get_ref_hash(net, self.share_info, common['ref_merkle_link']) + pack.IntType(32).pack(0),
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:
return dict(type=5, contents=self.share1b_type.pack(dict(common=self.common, other_txs=self.other_txs)))
def check(self, tracker):
+ if self.share_data['previous_share_hash'] is not None:
+ previous_share = tracker.shares[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 = 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)
if share_info != self.share_info:
raise ValueError('share_info invalid')
raise ValueError('share does not contain all txs')
return dict(header=self.header, txs=[self.check(tracker)] + self.other_txs)
+class NewShare(Share):
+ def __init__(self, *args, **kwargs):
+ Share.__init__(self, *args, **kwargs)
+ self.hash = bitcoin_data.hash256(share_type.pack(self.as_share()))
+
+ def check(self, tracker):
+ if self.share_data['previous_share_hash'] is not None:
+ previous_share = tracker.shares[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(2, 0) < sum(counts.itervalues())*85//100:
+ from p2pool import p2p
+ raise p2p.PeerMisbehavingError('NewShare without enough hash power upgraded')
+ 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.common['ref_merkle_link'], self.net)
+ 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''')
+ return gentx # only used by as_block
+
+ def as_share(self):
+ if not self.pow_hash <= self.header['bits'].target: # share1a
+ return dict(type=6, contents=self.share1a_type.pack(dict(common=self.common, merkle_link=self.merkle_link)))
+ else: # share1b
+ return dict(type=7, contents=self.share1b_type.pack(dict(common=self.common, other_txs=self.other_txs)))
+
+
class WeightsSkipList(forest.TrackerSkipList):
# share_count, weights, total_weight
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,
+ my_orphan_announce_count=lambda share: 1 if share.hash in my_share_hashes and share.share_data['stale_info'] == 'orphan' else 0,
+ my_dead_announce_count=lambda share: 1 if share.hash in my_share_hashes and share.share_data['stale_info'] == 'doa' else 0,
)), subset_of=self)
self.get_cumulative_weights = WeightsSkipList(self)
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.shares[share_hash].timestamp - tracker.shares[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_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))
res = dict((script, subsidy*weight//total_weight) for script, weight in weights.iteritems())
res[share.desired_version] = res.get(share.desired_version, 0) + bitcoin_data.target_to_average_attempts(share.target)
return res
+def get_warnings(tracker, current_work, net):
+ res = []
+
+ desired_version_counts = get_desired_version_counts(tracker, current_work.value['best_share_hash'],
+ min(60*60//net.SHARE_PERIOD, tracker.get_height(current_work.value['best_share_hash'])))
+ majority_desired_version = max(desired_version_counts, key=lambda k: desired_version_counts[k])
+ if majority_desired_version not in [0, 1, 2] 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())))
+
+ return res
+
def format_hash(x):
if x is None:
return 'xxxxxxxx'
git://git.novaco.in / p2pool.git / blobdiff