Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

set share diff target based on address hash rate #174

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

set share diff target based on address hash rate #174

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
71121fa
set share diff target based on address hash rate
roy7 Feb 12, 2014
8009126
log address not pubkey
roy7 Feb 12, 2014
b7bd49a
was out of sync on a prior change
roy7 Feb 12, 2014
322b791
local_addr_rates may not have been in scope, fetch them instead
roy7 Feb 12, 2014
e1df1e4
Storing results to use later instead of calling the function twice.
roy7 Mar 16, 2014
0f2a905
Merge branch 'master' of https://github.com/forrestv/p2pool into vard…
roy7 Mar 30, 2014
631346d
Logging change not required for new feature, conflicts the auto-worke…
roy7 Mar 30, 2014
b1a1af3
Merge branch 'master' of https://github.com/forrestv/p2pool into vard…
roy7 Apr 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions p2pool/work.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,14 +243,14 @@ def get_work(self, pubkey_hash, desired_share_target, desired_pseudoshare_target
else:
share_type = previous_share_type

local_addr_rates = self.get_local_addr_rates()

if desired_share_target is None:
desired_share_target = 2**256-1
local_hash_rate = self._estimate_local_hash_rate()
if local_hash_rate is not None:
local_hash_rate = local_addr_rates.get(pubkey_hash, 0)
if local_hash_rate > 0.0:
desired_share_target = min(desired_share_target,
bitcoin_data.average_attempts_to_target(local_hash_rate * self.node.net.SHARE_PERIOD / 0.0167)) # limit to 1.67% of pool shares by modulating share difficulty

local_addr_rates = self.get_local_addr_rates()
lookbehind = 3600//self.node.net.SHARE_PERIOD
block_subsidy = self.node.bitcoind_work.value['subsidy']
if previous_share is not None and self.node.tracker.get_height(previous_share.hash) > lookbehind:
Expand Down