From 7a6fd9ac30f92e556dd13b8995d36a0ec7845fb1 Mon Sep 17 00:00:00 2001 From: ahmedbodi Date: Fri, 31 Jan 2014 00:05:33 +0000 Subject: [PATCH 1/3] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 74499a3..7a46cc7 100644 --- a/README.md +++ b/README.md @@ -77,8 +77,7 @@ Please research and attempt to debug first. * Original version by Slush0 and ArtForz (original stratum code) * More Features added by GeneralFault, Wadee Womersley, Viperaus, TheSeven and Moopless -* Scrypt conversion from work done by viperaus -* Multi Algo, Vardiff, DB and MPOS support done by Ahmed_Bodi and Obigal +* Multi Algo, Vardiff, DB and MPOS support done by Ahmed_Bodi, penner42 and Obigal #License This software is provides AS-IS without any warranties of any kind. Please use at your own risk. From 781aa0285a8984679adea9a166b5de1b8a633d4f Mon Sep 17 00:00:00 2001 From: ahmedbodi Date: Fri, 31 Jan 2014 00:13:47 +0000 Subject: [PATCH 2/3] Update interfaces.py --- mining/interfaces.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mining/interfaces.py b/mining/interfaces.py index 4177aff..48f0012 100644 --- a/mining/interfaces.py +++ b/mining/interfaces.py @@ -82,7 +82,7 @@ class ShareManagerInterface(object): def on_submit_block(self, is_accepted, worker_name, block_header, block_hash, timestamp, ip, share_diff): log.info("Block %s %s" % (block_hash, 'ACCEPTED' if is_accepted else 'REJECTED')) - dbi.do_import(True) + dbi.do_import(dbi, True) dbi.found_block([worker_name, block_header, block_hash, -1, timestamp, is_accepted, ip, self.block_height, self.prev_hash, share_diff ]) class TimestamperInterface(object): From 052dc3ae5833a87519c81ce6535c4a1ff45cf7ac Mon Sep 17 00:00:00 2001 From: Alan Penner Date: Fri, 31 Jan 2014 09:15:43 -0800 Subject: [PATCH 3/3] fix indent --- lib/bitcoin_rpc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bitcoin_rpc.py b/lib/bitcoin_rpc.py index 7f23839..58035b6 100644 --- a/lib/bitcoin_rpc.py +++ b/lib/bitcoin_rpc.py @@ -117,7 +117,7 @@ class BitcoinRPC(object): if json.loads(resp)['result'] == None: # make sure the block was created. log.info("CHECKING FOR BLOCK AFTER SUBMITBLOCK") - defer.returnValue((yield self.blockexists(hash_hex, scrypt_hex))) + defer.returnValue((yield self.blockexists(hash_hex, scrypt_hex))) else: defer.returnValue(False)