first try at verifying that miner finds block solutions. TODO: disabl…

…e LP, allow cpu miners
p2pool · May 17, 2012 · b3810d0 · b3810d0
1 parent a7817ca
commit b3810d0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/p2pool/bitcoin/worker_interface.py b/p2pool/bitcoin/worker_interface.py
@@ -82,17 +82,13 @@ 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_list = self.work_cache.pop(key)
-        else:
-            res_list = list(self.worker_bridge.get_work(*key))
-            assert all(res.merkle_root not in self.merkle_root_to_handler for res, handler in res_list)
+        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

diff --git a/p2pool/main.py b/p2pool/main.py
@@ -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 ''
@@ -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:
@@ -690,14 +713,14 @@ def _(err):
 
                     return on_time
 
-                return tuple((bitcoin_getwork.BlockAttempt(
+                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))
+                ), 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)