RanchiMall/stratum-mining
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try both hash_hex and block_hex on checking for block submission

Browse Source
This commit is contained in:
Alan Penner 2014-01-22 11:38:06 -08:00 committed by Ahmed Bodiwala
parent a25489296b
commit 35cfaaf2d1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/bitcoin_rpc.py
View File

@ -63,7 +63,7 @@ class BitcoinRPC(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def submitblock(self, block_hex, hash_hex): def submitblock(self, block_hex, hash_hex):
#try 5 times? 500 Internal Server Error could mean random error or that TX messages setting is wrong #try 5 times? 500 Internal Server Error could mean random error or that TX messages setting is wrong
attempts = 0 attempts = 0
while True: while True:
attempts += 1 attempts += 1
@ -75,7 +75,7 @@ class BitcoinRPC(object):
log.debug("SUBMITBLOCK RESULT: %s", resp) log.debug("SUBMITBLOCK RESULT: %s", resp)
break break
except Exception as e: except Exception as e:
if attempts > 5: if attempts > 4:
log.exception("submitblock failed. Problem Submitting block %s" % str(e)) log.exception("submitblock failed. Problem Submitting block %s" % str(e))
log.exception("Try Enabling TX Messages in config.py!") log.exception("Try Enabling TX Messages in config.py!")
raise raise
@ -88,7 +88,7 @@ class BitcoinRPC(object):
resp = (yield self._call('getblocktemplate', [{'mode': 'submit', 'data': block_hex}])) resp = (yield self._call('getblocktemplate', [{'mode': 'submit', 'data': block_hex}]))
break break
except Exception as e: except Exception as e:
if attempts > 5: if attempts > 4:
log.exception("getblocktemplate submit failed. Problem Submitting block %s" % str(e)) log.exception("getblocktemplate submit failed. Problem Submitting block %s" % str(e))
log.exception("Try Enabling TX Messages in config.py!") log.exception("Try Enabling TX Messages in config.py!")
raise raise
@ -107,13 +107,19 @@ class BitcoinRPC(object):
resp = (yield self._call('getblocktemplate', [{'mode': 'submit', 'data': block_hex}])) resp = (yield self._call('getblocktemplate', [{'mode': 'submit', 'data': block_hex}]))
break break
except Exception as e: except Exception as e:
if attempts > 5: if attempts > 4:
log.exception("submitblock failed. Problem Submitting block %s" % str(e)) log.exception("submitblock failed. Problem Submitting block %s" % str(e))
log.exception("Try Enabling TX Messages in config.py!") log.exception("Try Enabling TX Messages in config.py!")
raise raise
else: else:
continue continue
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)))
else:
defer.returnValue(False)
@defer.inlineCallbacks @defer.inlineCallbacks
def getinfo(self): def getinfo(self):