From 831019545358a1b696ad285208d9fac24f88946d Mon Sep 17 00:00:00 2001 From: Vivek Teega Date: Thu, 31 Jan 2019 21:02:37 +0530 Subject: [PATCH] Update authors & uncomment scrypt checking --- AUTHORS | 13 ++++++++++++- electrum/blockchain.py | 10 +++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index 9cff0678..fdbf8297 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,5 @@ +Electrum-BTC +------------ ThomasV - Creator and maintainer. Animazing / Tachikoma - Styled the new GUI. Mac version. Azelphur - GUI stuff. @@ -9,4 +11,13 @@ Genjix - Porting pro-mode functionality to lite-gui and worked on server Slush - Work on the server. Designed the original Stratum spec. Julian Toash (Tuxavant) - Various fixes to the client. rdymac - Website and translations. -kyuupichan - Miscellaneous. \ No newline at end of file +kyuupichan - Miscellaneous. + + +FLO-Electrum +------------ +vivekteega - Maintainer and remaining stuff +Bitspill - Bootstraped the project with core FLO changes +Rohit Tripathy - Ideation and problem solving +akhil2015 - Flodata and scrypt hashing + diff --git a/electrum/blockchain.py b/electrum/blockchain.py index 57382639..a6c951df 100644 --- a/electrum/blockchain.py +++ b/electrum/blockchain.py @@ -267,21 +267,21 @@ class Blockchain(util.PrintError): @classmethod def verify_header(cls, header: dict, prev_hash: str, target: int, expected_header_hash: str=None) -> None: _hash = hash_header(header) - #_powhash = pow_hash_header(header) + _powhash = pow_hash_header(header) if expected_header_hash and expected_header_hash != _hash: raise Exception("hash mismatches with expected: {} vs {}".format(expected_header_hash, _hash)) if prev_hash != header.get('prev_block_hash'): raise Exception("prev hash mismatch: %s vs %s" % (prev_hash, header.get('prev_block_hash'))) if constants.net.TESTNET: return - #bits = cls.target_to_bits(target) + bits = cls.target_to_bits(target) bits = target if bits != header.get('bits'): raise Exception("bits mismatch: %s vs %s" % (bits, header.get('bits'))) block_hash_as_num = int.from_bytes(bfh(_hash), byteorder='big') - #target_val = cls.bits_to_target(bits) - #if int('0x' + _powhash, 16) > target_val: - # raise Exception("insufficient proof of work: %s vs target %s" % (int('0x' + _hash, 16), target_val)) + target_val = cls.bits_to_target(bits) + if int('0x' + _powhash, 16) > target_val: + raise Exception("insufficient proof of work: %s vs target %s" % (int('0x' + _hash, 16), target_val)) def verify_chunk(self, index: int, data: bytes) -> None: num = len(data) // HEADER_SIZE