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

Fix POW PubKey Error

Browse Source
This commit is contained in:
ahmedbodi 2014-01-28 11:12:23 +00:00
parent d5bee92932
commit 5fb1931fd3
1 changed files with 20 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lib/coinbaser.py
View File

@ -25,30 +25,35 @@ class SimpleCoinbaser(object):
def _validate(self): def _validate(self):
d = self.bitcoin_rpc.validateaddress(self.address) d = self.bitcoin_rpc.validateaddress(self.address)
if settings.COINDAEMON_Reward == 'POW': d.addCallback(self.address_check)
d.addCallback(self._POW_address_check)
else:
d.addCallback(self._POS_address_check)
d.addErrback(self._failure) d.addErrback(self._failure)
def _POW_address_check(self, result): def address_check(self, result):
if result['isvalid'] and result['ismine']: if result['isvalid'] and result['ismine']:
self.is_valid = True self.is_valid = True
log.info("Coinbase address '%s' is valid" % self.address) log.info("Coinbase address '%s' is valid" % self.address)
if result['isvalid'] == True: if 'address' in result:
log.debug("Is Valid = %s" % result['isvalid']) log.debug("Address = %s " % result['address'])
log.debug("Address = %s " % result['address']) self.address = result['address']
log.debug("PubKey = %s " % result['pubkey']) if 'pubkey' in result:
log.debug("Is Compressed = %s " % result['iscompressed']) log.debug("PubKey = %s " % result['pubkey'])
log.debug("Account = %s " % result['account']) self.pubkey = result['pubkey']
self.address = result['address'] if 'iscompressed' in result:
log.debug("Is Compressed = %s " % result['iscompressed'])
if 'account' in result:
log.debug("Account = %s " % result['account'])
if not self.on_load.called: if not self.on_load.called:
self.on_load.callback(True) self.address = result['address']
self.on_load.callback(True)
elif result['isvalid'] and settings.ALLOW_NONLOCAL_WALLET == True : elif result['isvalid'] and settings.ALLOW_NONLOCAL_WALLET == True :
self.is_valid = True self.is_valid = True
log.warning("!!! Coinbase address '%s' is valid BUT it is not local" % self.address) log.warning("!!! Coinbase address '%s' is valid BUT it is not local" % self.address)
if 'pubkey' in result:
log.debug("PubKey = %s " % result['pubkey'])
self.pubkey = result['pubkey']
if 'account' in result:
log.debug("Account = %s " % result['account'])
if not self.on_load.called: if not self.on_load.called:
self.on_load.callback(True) self.on_load.callback(True)
@ -56,31 +61,7 @@ class SimpleCoinbaser(object):
self.is_valid = False self.is_valid = False
log.error("Coinbase address '%s' is NOT valid!" % self.address) log.error("Coinbase address '%s' is NOT valid!" % self.address)
def _POS_address_check(self, result): #def on_new_block(self):
if result['isvalid'] and result['ismine']:
self.is_valid = True
log.info("Coinbase address '%s' is valid" % self.address)
if result['isvalid'] == True:
log.debug("Is Valid = %s" % result['isvalid'])
log.debug("Address = %s " % result['address'])
log.debug("PubKey = %s " % result['pubkey'])
log.debug("Is Compressed = %s " % result['iscompressed'])
log.debug("Account = %s " % result['account'])
self.pubkey = result['pubkey']
if not self.on_load.called:
self.on_load.callback(True)
elif result['isvalid'] and settings.ALLOW_NONLOCAL_WALLET == True :
self.is_valid = True
log.warning("!!! Coinbase address '%s' is valid BUT it is not local" % self.address)
self.pubkey = result['pubkey']
if not self.on_load.called:
self.on_load.callback(True)
else:
self.is_valid = False
#def on_new_block(self):
# pass # pass
#def on_new_template(self): #def on_new_template(self):