diff --git a/onionr/communicator.py b/onionr/communicator.py index b9339860..413ee3ee 100755 --- a/onionr/communicator.py +++ b/onionr/communicator.py @@ -33,14 +33,17 @@ class OnionrCommunicate: self._core = core.Core() self._utils = onionrutils.OnionrUtils(self._core) self._crypto = onionrcrypto.OnionrCrypto(self._core) - + ''' + logger.info('Starting Bitcoin Node... with Tor socks port:' + str(sys.argv[2])) try: - logger.info('Starting Bitcoin Node... with Tor socks port:' + str(sys.argv[2])) self.bitcoin = btc.OnionrBTC(torP=int(sys.argv[2])) - logger.info('Bitcoin Node started, on block: ' + self.bitcoin.node.getBlockHash(self.bitcoin.node.getLastBlockHeight())) - except: - logger.fatal('Failed to start Bitcoin Node, exiting...') - exit(1) + except _gdbm.error: + pass + logger.info('Bitcoin Node started, on block: ' + self.bitcoin.node.getBlockHash(self.bitcoin.node.getLastBlockHeight())) + ''' + #except: + #logger.fatal('Failed to start Bitcoin Node, exiting...') + #exit(1) blockProcessTimer = 0 blockProcessAmount = 5 @@ -229,4 +232,5 @@ if shouldRun: try: OnionrCommunicate(debug, developmentMode) except KeyboardInterrupt: + sys.exit(1) pass diff --git a/onionr/onionrproofs.py b/onionr/onionrproofs.py index f996af9d..546e4449 100644 --- a/onionr/onionrproofs.py +++ b/onionr/onionrproofs.py @@ -30,12 +30,12 @@ class POW: hbCount = 0 blockCheck = 300000 # How often the hasher should check if the bitcoin block is updated (slows hashing but prevents less wasted work) blockCheckCount = 0 - block = self.bitcoinNode.getBlockHash(self.bitcoinNode.getLastBlockHeight()) + block = ''#self.bitcoinNode.getBlockHash(self.bitcoinNode.getLastBlockHeight()) while self.hashing: if blockCheckCount == blockCheck: if self.reporting: logger.debug('Refreshing Bitcoin block') - block = self.bitcoinNode.getBlockHash(self.bitcoinNode.getLastBlockHeight()) + block = ''#self.bitcoinNode.getBlockHash(self.bitcoinNode.getLastBlockHeight()) blockCheckCount = 0 blockCheckCount += 1 hbCount += 1