Merge branch 'ahmedmaster'

This commit is contained in:
Alan Penner 2014-01-31 11:35:39 -08:00
commit 223b172cc6
2 changed files with 2 additions and 3 deletions

View File

@ -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.

View File

@ -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):