X-Git-Url: https://git.novaco.in/?p=stratum-mining.git;a=blobdiff_plain;f=mining%2Fservice.py;fp=mining%2Fservice.py;h=7bf4dcec612038c804430e56c3303ffae4042b4a;hp=30451d971d28206532a8b20818200d782b740a2a;hb=679245b565edcb2a03d865df3c08e86c0d6f402d;hpb=8a7474eb0eefdbc68e9b57371a68c25f33427f0d

diff --git a/mining/service.py b/mining/service.py
index 30451d9..7bf4dce 100644
--- a/mining/service.py
+++ b/mining/service.py
@@ -9,78 +9,78 @@ from lib.exceptions import SubmitException
 
 import stratum.logger
 log = stratum.logger.get_logger('mining')
-                
+
 class MiningService(GenericService):
     '''This service provides public API for Stratum mining proxy
     or any Stratum-compatible miner software.
-    
+
     Warning - any callable argument of this class will be propagated
     over Stratum protocol for public audience!'''
-    
+
     service_type = 'mining'
     service_vendor = 'stratum'
     is_default = True
-    
+
     @admin
     def update_block(self):
-        '''Connect this RPC call to 'bitcoind -blocknotify' for 
+        '''Connect this RPC call to 'bitcoind -blocknotify' for
         instant notification about new block on the network.
         See blocknotify.sh in /scripts/ for more info.'''
-        
+
         log.info("New block notification received")
         Interfaces.template_registry.update_block()
-        return True 
-    
+        return True
+
     def authorize(self, worker_name, worker_password):
         '''Let authorize worker on this connection.'''
-        
+
         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, *args):
         '''Subscribe for receiving mining jobs. This will
         return subscription details, extranonce1_hex and extranonce2_size'''
-        
+
         extranonce1 = Interfaces.template_registry.get_new_extranonce1()
         extranonce2_size = Interfaces.template_registry.extranonce2_size
         extranonce1_hex = binascii.hexlify(extranonce1)
-        
+
         session = self.connection_ref().get_session()
         session['extranonce1'] = extranonce1
         session['difficulty'] = 1 # Following protocol specs, default diff is 1
 
         return Pubsub.subscribe(self.connection_ref(), MiningSubscription()) + (extranonce1_hex, extranonce2_size)
-    
-    '''    
+
+    '''
     def submit(self, worker_name, job_id, extranonce2, ntime, nonce):
         import time
         start = time.time()
-        
+
         for x in range(100):
             try:
                 ret = self.submit2(worker_name, job_id, extranonce2, ntime, nonce)
             except:
                 pass
-            
+
         log.info("LEN %.03f" % (time.time() - start))
         return ret
     '''
-        
+
     def submit(self, worker_name, job_id, extranonce2, ntime, nonce):
         '''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)):
@@ -90,12 +90,12 @@ class MiningService(GenericService):
         extranonce1_bin = session.get('extranonce1', None)
         if not extranonce1_bin:
             raise SubmitException("Connection is not subscribed for mining")
-        
+
         difficulty = session['difficulty']
         submit_time = Interfaces.timestamper.time()
-    
+
         Interfaces.share_limiter.submit(self.connection_ref, difficulty, submit_time)
-            
+
         # This checks if submitted share meet all requirements
         # and it is valid proof of work.
         try:
@@ -104,13 +104,13 @@ class MiningService(GenericService):
         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)    
+                                                 submit_time, False)
             raise
-            
-             
+
+
         Interfaces.share_manager.on_submit_share(worker_name, block_header, block_hash, difficulty,
                                                  submit_time, True)
-        
+
         if on_submit != None:
             # Pool performs submitblock() to bitcoind. Let's hook
             # to result and report it to share manager
@@ -118,18 +118,18 @@ class MiningService(GenericService):
                         worker_name, block_header, block_hash, submit_time)
 
         return True
-            
+
     # Service documentation for remote discovery
     update_block.help_text = "Notify Stratum server about new block on the network."
     update_block.params = [('password', 'string', 'Administrator password'),]
-    
+
     authorize.help_text = "Authorize worker for submitting shares on this connection."
     authorize.params = [('worker_name', 'string', 'Name of the worker, usually in the form of user_login.worker_id.'),
                         ('worker_password', 'string', 'Worker password'),]
-    
+
     subscribe.help_text = "Subscribes current connection for receiving new mining jobs."
     subscribe.params = []
-    
+
     submit.help_text = "Submit solved share back to the server. Excessive sending of invalid shares "\
                        "or shares above indicated target (see Stratum mining docs for set_target()) may lead "\
                        "to temporary or permanent ban of user,worker or IP address."
@@ -138,4 +138,4 @@ class MiningService(GenericService):
                      ('extranonce2', 'string', 'hex-encoded big-endian extranonce2, length depends on extranonce2_size from mining.notify.'),
                      ('ntime', 'string', 'UNIX timestamp (32bit integer, big-endian, hex-encoded), must be >= ntime provided by mining,notify and <= current time'),
                      ('nonce', 'string', '32bit integer, hex-encoded, big-endian'),]
-        
+