sadsadasdasdasd

This commit is contained in:
Thomas Zarebczan 2018-11-16 17:48:43 -05:00
parent b6a3bfd28a
commit 103d234be3

View file

@ -196,7 +196,7 @@ class Blockchain(util.PrintError):
num = len(data) // HEADER_SIZE num = len(data) // HEADER_SIZE
start_height = index * 2016 start_height = index * 2016
prev_hash = self.get_hash(start_height - 1) prev_hash = self.get_hash(start_height - 1)
bits, target = self.get_target2(index-1) bits, target = self.get_target2(index, header)
for i in range(num): for i in range(num):
height = start_height + i height = start_height + i
try: try:
@ -384,7 +384,7 @@ class Blockchain(util.PrintError):
bnNew = ArithUint256(MAX_TARGET) bnNew = ArithUint256(MAX_TARGET)
return bnNew.GetCompact(), bnNew._value return bnNew.GetCompact(), bnNew._value
def get_target2(self, index, chain='main'): def get_target2(self, index, last, chain='main'):
""" """
this follows the calculations in lbrycrd/src/lbry.cpp this follows the calculations in lbrycrd/src/lbry.cpp
Returns: (bits, target) Returns: (bits, target)
@ -393,8 +393,7 @@ class Blockchain(util.PrintError):
return GENESIS_BITS, MAX_TARGET return GENESIS_BITS, MAX_TARGET
if index == 0: if index == 0:
return GENESIS_BITS, MAX_TARGET return GENESIS_BITS, MAX_TARGET
first = self.read_header(index * 2016) first = self.read_header(index -1)
last = self.read_header(index * 2016 + 2015)
assert last is not None, "Last shouldn't be none" assert last is not None, "Last shouldn't be none"
# bits to target # bits to target
bits = last.get('bits') bits = last.get('bits')
@ -461,7 +460,7 @@ class Blockchain(util.PrintError):
return False return False
self.print_error("4") self.print_error("4")
try: try:
bits, target = self.get_target2(height // 2016 - 1) bits, target = self.get_target2(height, header)
except MissingHeader: except MissingHeader:
return False return False
self.print_error("5") self.print_error("5")