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

Worker check #320

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

Worker check #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7817ca
changed WorkerBridge to return a list of work units instead of having…
forrestv May 17, 2012
b3810d0
first try at verifying that miner finds block solutions. TODO: disabl…
forrestv May 17, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 9 additions & 11 deletions p2pool/bitcoin/worker_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,23 +82,21 @@ def _getwork(self, request, data, long_poll):
yield self.worker_bridge.new_work_event.get_deferred()
self.worker_views[request_id] = self.worker_bridge.new_work_event.times

key = self.worker_bridge.preprocess_request(request)
key = yield self.worker_bridge.preprocess_request(request)

if self.work_cache_times != self.worker_bridge.new_work_event.times:
self.work_cache = {}
self.work_cache_times = self.worker_bridge.new_work_event.times

if key in self.work_cache:
res, orig_timestamp, handler = self.work_cache.pop(key)
else:
res, handler = self.worker_bridge.get_work(*key)
assert res.merkle_root not in self.merkle_root_to_handler
orig_timestamp = res.timestamp

self.merkle_root_to_handler[res.merkle_root] = handler
res_list = self.work_cache.pop(key) if key in self.work_cache else list((yield self.worker_bridge.get_work(*key)))
res, handler = res_list.pop()
if res_list:
self.work_cache[key] = res_list

if res.timestamp + 12 < orig_timestamp + 600:
self.work_cache[key] = res.update(timestamp=res.timestamp + 12), orig_timestamp, handler
if res.merkle_root in self.merkle_root_to_handler:
assert self.merkle_root_to_handler[res.merkle_root] is handler
else:
self.merkle_root_to_handler[res.merkle_root] = handler

if p2pool.DEBUG:
print 'POLL %i END identifier=%i' % (id, self.worker_bridge.new_work_event.times)
Expand Down
40 changes: 31 additions & 9 deletions p2pool/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,8 @@ def __init__(self):
worker_interface.WorkerBridge.__init__(self)
self.new_work_event = current_work.changed
self.recent_shares_ts_work = []
self.okay_user_agents = set()
self.got_resp = self.got_resp

def get_user_details(self, request):
user = request.getUser() if request.getUser() is not None else ''
Expand Down Expand Up @@ -499,10 +501,31 @@ def get_user_details(self, request):
return user, pubkey_hash, desired_share_target, desired_pseudoshare_target

def preprocess_request(self, request):
if request.getHeader('User-Agent') not in self.okay_user_agents:
print "Testing", request.getHeader('User-Agent')
return None, 0, 0
user, pubkey_hash, desired_share_target, desired_pseudoshare_target = self.get_user_details(request)
return pubkey_hash, desired_share_target, desired_pseudoshare_target

def got_resp(self, header, request):
if net.PARENT.POW_FUNC(bitcoin_data.block_header_type.pack(header)) == 0x000000000000084ac774944c084fe671558f217e29e277b11780771e0a86a680:
print request.getHeader('User-Agent'), "okay"
self.okay_user_agents.add(request.getHeader('User-Agent'))
return True

@defer.inlineCallbacks
def get_work(self, pubkey_hash, desired_share_target, desired_pseudoshare_target):
if (pubkey_hash, desired_share_target, desired_pseudoshare_target) == (None, 0, 0):
ba = bitcoin_getwork.BlockAttempt(
version=1,
previous_block=0x00000000000007da8abb36a33bb79136998620edc862ce7ecde30fad3352e026,
merkle_root=0x268e290e2195d91716f00176fd99b5ad5fecdb203baa4e61435771f3e431c5ce,
timestamp=1337225116,
bits=bitcoin_data.FloatingInteger(436841986),
share_target=2**(256-32)-1,
)
defer.returnValue(((ba, self.got_resp),))
yield 5
if len(p2p_node.peers) == 0 and net.PERSIST:
raise jsonrpc.Error(-12345, u'p2pool is not connected to any peers')
if current_work.value['best_share_hash'] is None and net.PERSIST:
Expand Down Expand Up @@ -589,14 +612,6 @@ def get_work(self, pubkey_hash, desired_share_target, desired_pseudoshare_target

bits = current_work.value['bits']
previous_block = current_work.value['previous_block']
ba = bitcoin_getwork.BlockAttempt(
version=current_work.value['version'],
previous_block=current_work.value['previous_block'],
merkle_root=merkle_root,
timestamp=current_work2.value['time'],
bits=current_work.value['bits'],
share_target=target,
)

received_header_hashes = set()

Expand Down Expand Up @@ -698,7 +713,14 @@ def _(err):

return on_time

return ba, got_response
defer.returnValue(tuple((bitcoin_getwork.BlockAttempt(
version=current_work.value['version'],
previous_block=current_work.value['previous_block'],
merkle_root=merkle_root,
timestamp=current_work2.value['time']+12*i,
bits=current_work.value['bits'],
share_target=target,
), got_response) for i in xrange(50)))

get_current_txouts = lambda: p2pool_data.get_expected_payouts(tracker, current_work.value['best_share_hash'], current_work.value['bits'].target, current_work2.value['subsidy'], net)

Expand Down