LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

require previous_winning arg for get_takeover_name_ops

Browse source
This commit is contained in:
Jack Robison 2021-05-25 18:42:08 -04:00 committed by Victor Shyba
parent d69180da71
commit 2ba044ee4e
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lbry/wallet/server/block_processor.py
View file

@ -833,7 +833,7 @@ class BlockProcessor:
k.position, height, name, amount k.position, height, name, amount
).get_activate_ops() ).get_activate_ops()
) )
ops.extend(get_takeover_name_ops(name, winning_including_future_activations, height)) ops.extend(get_takeover_name_ops(name, winning_including_future_activations, height, controlling))
elif not controlling or (winning_claim_hash != controlling.claim_hash and elif not controlling or (winning_claim_hash != controlling.claim_hash and
name in names_with_abandoned_controlling_claims) or \ name in names_with_abandoned_controlling_claims) or \
((winning_claim_hash != controlling.claim_hash) and (amounts[winning_claim_hash] > amounts[controlling.claim_hash])): ((winning_claim_hash != controlling.claim_hash) and (amounts[winning_claim_hash] > amounts[controlling.claim_hash])):
@ -862,7 +862,7 @@ class BlockProcessor:
position, height, name, amount position, height, name, amount
).get_activate_ops() ).get_activate_ops()
) )
ops.extend(get_takeover_name_ops(name, winning_claim_hash, height)) ops.extend(get_takeover_name_ops(name, winning_claim_hash, height, controlling))
elif winning_claim_hash == controlling.claim_hash: elif winning_claim_hash == controlling.claim_hash:
print("\tstill winning") print("\tstill winning")
pass pass
@ -887,8 +887,7 @@ class BlockProcessor:
winning = max(amounts, key=lambda x: amounts[x]) winning = max(amounts, key=lambda x: amounts[x])
if (controlling and winning != controlling.claim_hash) or (not controlling and winning): if (controlling and winning != controlling.claim_hash) or (not controlling and winning):
print(f"\ttakeover from abandoned support {controlling.claim_hash.hex()} -> {winning.hex()}") print(f"\ttakeover from abandoned support {controlling.claim_hash.hex()} -> {winning.hex()}")
ops.extend(get_takeover_name_ops(name, winning, height)) ops.extend(get_takeover_name_ops(name, winning, height, controlling))
return ops return ops
def advance_block(self, block): def advance_block(self, block):

2
lbry/wallet/server/db/claimtrie.py
View file

@ -89,7 +89,7 @@ def get_remove_name_ops(name: str, claim_hash: bytes, height: int) -> typing.Lis
def get_takeover_name_ops(name: str, claim_hash: bytes, takeover_height: int, def get_takeover_name_ops(name: str, claim_hash: bytes, takeover_height: int,
previous_winning: Optional[ClaimTakeoverValue] = None): previous_winning: Optional[ClaimTakeoverValue]):
if previous_winning: if previous_winning:
return [ return [
RevertableDelete( RevertableDelete(