Improved exception handling of submit()

[stratum-mining.git] / mining / service.py

diff --git a/mining/service.py b/mining/service.py
index f3a6861..d9efa95 100644 (file)
--- a/mining/service.py
+++ b/mining/service.py
@@ -2,16 +2,13 @@ import binascii
 from twisted.internet import defer
 
 from stratum.services import GenericService, admin
-from stratum.custom_exceptions import ServiceException
 from stratum.pubsub import Pubsub
 from interfaces import Interfaces
 from subscription import MiningSubscription
+from lib.exceptions import SubmitException
 
 import stratum.logger
 log = stratum.logger.get_logger('mining')
-
-class SubmitException(ServiceException):
-    pass
                 
 class MiningService(GenericService):
     '''This service provides public API for Stratum mining proxy
@@ -34,7 +31,18 @@ class MiningService(GenericService):
     
     def authorize(self, worker_name, worker_password):
         '''Let authorize worker on this connection.'''
-        return Interfaces.worker_manager.authorize(worker_name, worker_password)
+        
+        session = self.connection_ref().get_session()
+        session.setdefault('authorized', {})
+        
+        if Interfaces.worker_manager.authorize(worker_name, worker_password):
+            session['authorized'][worker_name] = worker_password
+            return True
+        
+        else:
+            if worker_name in session['authorized']:
+                del session['authorized'][worker_name]
+            return False
         
     def subscribe(self):
         '''Subscribe for receiving mining jobs. This will
@@ -70,6 +78,12 @@ class MiningService(GenericService):
         '''Try to solve block candidate using given parameters.'''
         
         session = self.connection_ref().get_session()
+        session.setdefault('authorized', {})
+        
+        # Check if worker is authorized to submit shares
+        if not Interfaces.worker_manager.authorize(worker_name,
+                        session['authorized'].get(worker_name)):
+            raise SubmitException("Worker is not authorized")
 
         # Check if extranonce1 is in connection session
         extranonce1_bin = session.get('extranonce1', None)
@@ -78,21 +92,28 @@ class MiningService(GenericService):
         
         difficulty = session['difficulty']
 
+        submit_time = Interfaces.timestamper.time()
+        
         # This checks if submitted share meet all requirements
         # and it is valid proof of work.
-        (is_valid, reason, block_header, block_hash) = Interfaces.template_registry.submit_share(job_id,
-                                                worker_name, extranonce1_bin, extranonce2, ntime, nonce, difficulty,
-                                                Interfaces.share_manager.on_submit_block)
-        
-        if block_header != None:
-            # block header is missing when template registry was unable to build it
-            # from given parameters. Client side is probably broken, storing such
-            # submit don't have any sense.                   
-            Interfaces.share_manager.on_submit_share(worker_name, block_header, block_hash, difficulty,
-                                              Interfaces.timestamper.time(), is_valid)
+        try:
+            (block_header, block_hash, on_submit) = Interfaces.template_registry.submit_share(job_id,
+                                                worker_name, extranonce1_bin, extranonce2, ntime, nonce, difficulty)
+        except SubmitException:
+            # block_header and block_hash are None when submitted data are corrupted
+            Interfaces.share_manager.on_submit_share(worker_name, None, None, difficulty,
+                                                 submit_time, False)    
+            raise
+            
+             
+        Interfaces.share_manager.on_submit_share(worker_name, block_header, block_hash, difficulty,
+                                                 submit_time, True)
         
-        if not is_valid:
-            raise SubmitException(reason)
+        if on_submit != None:
+            # Pool performs submitblock() to bitcoind. Let's hook
+            # to result and report it to share manager
+            on_submit.addCallback(Interfaces.share_manager.on_submit_block,
+                        worker_name, block_header, block_hash, submit_time)
 
         return True