LBRYCommunity/hub
1
0
Fork 0
Code Issues 35 Pull requests 6 Projects Releases Packages Wiki Activity

fix handling supports without claims

Browse source
This commit is contained in:
Jack Robison 2022-10-16 15:07:34 -04:00
parent b230b693f8
commit 0634c1e05f
1 changed files with 63 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
hub/scribe/service.py
View file

@ -78,7 +78,7 @@ class BlockchainProcessorService(BlockchainService):
# claim hash to lists of pending support txos # claim hash to lists of pending support txos
self.support_txos_by_claim: DefaultDict[bytes, List[Tuple[int, int]]] = defaultdict(list) self.support_txos_by_claim: DefaultDict[bytes, List[Tuple[int, int]]] = defaultdict(list)
# support txo: (supported claim hash, support amount) # support txo: (supported claim hash, support amount)
self.support_txo_to_claim: Dict[Tuple[int, int], Tuple[bytes, int]] = {} self.support_txo_to_claim: Dict[Tuple[int, int], Tuple[bytes, int, str]] = {}
# removed supports {name: {claim_hash: [(tx_num, nout), ...]}} # removed supports {name: {claim_hash: [(tx_num, nout), ...]}}
self.removed_support_txos_by_name_by_claim: DefaultDict[str, DefaultDict[bytes, List[Tuple[int, int]]]] = \ self.removed_support_txos_by_name_by_claim: DefaultDict[str, DefaultDict[bytes, List[Tuple[int, int]]]] = \
defaultdict(lambda: defaultdict(list)) defaultdict(lambda: defaultdict(list))
@ -496,7 +496,11 @@ class BlockchainProcessorService(BlockchainService):
def _add_support(self, height: int, txo: 'TxOutput', tx_num: int, nout: int): def _add_support(self, height: int, txo: 'TxOutput', tx_num: int, nout: int):
supported_claim_hash = txo.support.claim_hash[::-1] supported_claim_hash = txo.support.claim_hash[::-1]
self.support_txos_by_claim[supported_claim_hash].append((tx_num, nout)) self.support_txos_by_claim[supported_claim_hash].append((tx_num, nout))
self.support_txo_to_claim[(tx_num, nout)] = supported_claim_hash, txo.value try:
normalized_name = normalize_name(txo.support.name.decode())
except UnicodeDecodeError:
normalized_name = ''.join(chr(x) for x in txo.support.name)
self.support_txo_to_claim[(tx_num, nout)] = supported_claim_hash, txo.value, normalized_name
# print(f"\tsupport claim {supported_claim_hash.hex()} +{txo.value}") # print(f"\tsupport claim {supported_claim_hash.hex()} +{txo.value}")
self.db.prefix_db.claim_to_support.stash_put((supported_claim_hash, tx_num, nout), (txo.value,)) self.db.prefix_db.claim_to_support.stash_put((supported_claim_hash, tx_num, nout), (txo.value,))
@ -714,10 +718,6 @@ class BlockchainProcessorService(BlockchainService):
name, normalized_name, claim_hash, prev_amount, expiration, tx_num, nout, claim_root_tx_num, name, normalized_name, claim_hash, prev_amount, expiration, tx_num, nout, claim_root_tx_num,
claim_root_idx, signature_is_valid, prev_signing_hash, reposted_claim_hash claim_root_idx, signature_is_valid, prev_signing_hash, reposted_claim_hash
) )
for support_txo_to_clear in self.support_txos_by_claim[claim_hash]:
self.support_txo_to_claim.pop(support_txo_to_clear)
self.support_txos_by_claim[claim_hash].clear()
self.support_txos_by_claim.pop(claim_hash)
if normalized_name.startswith('@'): # abandon a channel, invalidate signatures if normalized_name.startswith('@'): # abandon a channel, invalidate signatures
self._invalidate_channel_signatures(claim_hash) self._invalidate_channel_signatures(claim_hash)
@ -947,7 +947,6 @@ class BlockchainProcessorService(BlockchainService):
staged_is_controlling = False if not controlling else claim_hash == controlling.claim_hash staged_is_controlling = False if not controlling else claim_hash == controlling.claim_hash
controlling_is_abandoned = False if not controlling else \ controlling_is_abandoned = False if not controlling else \
name in names_with_abandoned_or_updated_controlling_claims name in names_with_abandoned_or_updated_controlling_claims
if nothing_is_controlling or staged_is_controlling or controlling_is_abandoned: if nothing_is_controlling or staged_is_controlling or controlling_is_abandoned:
delay = 0 delay = 0
elif is_new_claim: elif is_new_claim:
@ -1035,24 +1034,27 @@ class BlockchainProcessorService(BlockchainService):
) )
# and the supports # and the supports
for (tx_num, nout), (claim_hash, amount) in self.support_txo_to_claim.items(): check_supported_claim_exists = set()
for (tx_num, nout), (claim_hash, amount, supported_name) in self.support_txo_to_claim.items():
if claim_hash in self.abandoned_claims: if claim_hash in self.abandoned_claims:
continue continue
elif claim_hash in self.claim_hash_to_txo: elif claim_hash in self.claim_hash_to_txo:
name = self.txo_to_claim[self.claim_hash_to_txo[claim_hash]].normalized_name delay = not self.txo_to_claim[self.claim_hash_to_txo[claim_hash]].is_update
staged_is_new_claim = not self.txo_to_claim[self.claim_hash_to_txo[claim_hash]].is_update
else: else:
supported_claim_info = self.db.get_claim_txo(claim_hash) check_supported_claim_exists.add(claim_hash)
if not supported_claim_info: delay = True
# the supported claim doesn't exist
continue
else:
v = supported_claim_info
name = v.normalized_name
staged_is_new_claim = (v.root_tx_num, v.root_position) == (v.tx_num, v.position)
get_delayed_activate_ops( get_delayed_activate_ops(
name, claim_hash, staged_is_new_claim, tx_num, nout, amount, is_support=True supported_name, claim_hash, delay, tx_num, nout, amount, is_support=True
) )
check_supported_claim_exists = list(check_supported_claim_exists)
# claims that are supported that don't exist (yet, maybe never)
headless_supported_claims = {
claim_hash for claim_hash, v in zip(
check_supported_claim_exists, self.db.prefix_db.claim_to_txo.multi_get(
[(c_h,) for c_h in check_supported_claim_exists]
)
) if v is None
}
activated_added_to_effective_amount = set() activated_added_to_effective_amount = set()
@ -1296,47 +1298,51 @@ class BlockchainProcessorService(BlockchainService):
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_or_updated_controlling_claims) or \ name in names_with_abandoned_or_updated_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])):
# print(f"\ttakeover by {winning_claim_hash.hex()} at {height}") if winning_claim_hash in headless_supported_claims:
if (name, winning_claim_hash) in need_reactivate_if_takes_over: # print(f"\tclaim that would be winning {winning_claim_hash.hex()} at {height} does not exist, no takeover")
previous_pending_activate = need_reactivate_if_takes_over[(name, winning_claim_hash)] pass
amount = self.db.get_claim_txo_amount( else:
winning_claim_hash # print(f"\ttakeover by {winning_claim_hash.hex()} at {height}")
) if (name, winning_claim_hash) in need_reactivate_if_takes_over:
if winning_claim_hash in self.claim_hash_to_txo: previous_pending_activate = need_reactivate_if_takes_over[(name, winning_claim_hash)]
tx_num, position = self.claim_hash_to_txo[winning_claim_hash] amount = self.db.get_claim_txo_amount(
amount = self.txo_to_claim[(tx_num, position)].amount winning_claim_hash
else: )
tx_num, position = previous_pending_activate.tx_num, previous_pending_activate.position if winning_claim_hash in self.claim_hash_to_txo:
if previous_pending_activate.height > height: tx_num, position = self.claim_hash_to_txo[winning_claim_hash]
# the claim had a pending activation in the future, move it to now amount = self.txo_to_claim[(tx_num, position)].amount
if tx_num < self.tx_count: else:
self.get_remove_activate_ops( tx_num, position = previous_pending_activate.tx_num, previous_pending_activate.position
if previous_pending_activate.height > height:
# the claim had a pending activation in the future, move it to now
if tx_num < self.tx_count:
self.get_remove_activate_ops(
ACTIVATED_CLAIM_TXO_TYPE, winning_claim_hash, tx_num,
position, previous_pending_activate.height, name, amount
)
pending_activated = self.db.prefix_db.activated.get_pending(
ACTIVATED_CLAIM_TXO_TYPE, tx_num, position
)
if pending_activated:
self.get_remove_activate_ops(
ACTIVATED_CLAIM_TXO_TYPE, winning_claim_hash, tx_num, position,
pending_activated.height, name, amount
)
self.get_activate_ops(
ACTIVATED_CLAIM_TXO_TYPE, winning_claim_hash, tx_num, ACTIVATED_CLAIM_TXO_TYPE, winning_claim_hash, tx_num,
position, previous_pending_activate.height, name, amount position, height, name, amount
) )
pending_activated = self.db.prefix_db.activated.get_pending( if winning_claim_hash not in activated_added_to_effective_amount:
ACTIVATED_CLAIM_TXO_TYPE, tx_num, position self.effective_amount_delta[winning_claim_hash] += amount
self.taken_over_names.add(name)
if controlling:
self.db.prefix_db.claim_takeover.stash_delete(
(name,), (controlling.claim_hash, controlling.height)
) )
if pending_activated: self.db.prefix_db.claim_takeover.stash_put((name,), (winning_claim_hash, height))
self.get_remove_activate_ops( if controlling and controlling.claim_hash not in self.abandoned_claims:
ACTIVATED_CLAIM_TXO_TYPE, winning_claim_hash, tx_num, position, self.touched_claim_hashes.add(controlling.claim_hash)
pending_activated.height, name, amount self.touched_claim_hashes.add(winning_claim_hash)
)
self.get_activate_ops(
ACTIVATED_CLAIM_TXO_TYPE, winning_claim_hash, tx_num,
position, height, name, amount
)
if winning_claim_hash not in activated_added_to_effective_amount:
self.effective_amount_delta[winning_claim_hash] += amount
self.taken_over_names.add(name)
if controlling:
self.db.prefix_db.claim_takeover.stash_delete(
(name,), (controlling.claim_hash, controlling.height)
)
self.db.prefix_db.claim_takeover.stash_put((name,), (winning_claim_hash, height))
if controlling and controlling.claim_hash not in self.abandoned_claims:
self.touched_claim_hashes.add(controlling.claim_hash)
self.touched_claim_hashes.add(winning_claim_hash)
elif winning_claim_hash == controlling.claim_hash: elif winning_claim_hash == controlling.claim_hash:
# print("\tstill winning") # print("\tstill winning")
pass pass
@ -1526,14 +1532,6 @@ class BlockchainProcessorService(BlockchainService):
for claim_hash, v in current_effective_amount_values.items() if v is not None for claim_hash, v in current_effective_amount_values.items() if v is not None
] ]
claims = set(self.effective_amount_delta.keys()).union(self.active_support_amount_delta.keys()) claims = set(self.effective_amount_delta.keys()).union(self.active_support_amount_delta.keys())
claims = claims.difference(self.abandoned_claims.keys())
# check that all of the claims exist, it's possible we got supports for claims that don't exist
missing = set()
for claim_hash, claim_txo in zip(
claims, self.db.prefix_db.claim_to_txo.multi_get([(claim_hash,) for claim_hash in claims])):
if not claim_txo and claim_hash not in self.claim_hash_to_txo:
missing.add(claim_hash) # it's a support for a claim that doesn't exist
claims = claims.difference(missing)
new_effective_amounts = { new_effective_amounts = {
claim_hash: ((current_effective_amounts.get(claim_hash, 0) or 0) + self.effective_amount_delta.get(claim_hash, 0), claim_hash: ((current_effective_amounts.get(claim_hash, 0) or 0) + self.effective_amount_delta.get(claim_hash, 0),
(current_supports_amount.get(claim_hash, 0) or 0) + self.active_support_amount_delta.get(claim_hash, 0)) (current_supports_amount.get(claim_hash, 0) or 0) + self.active_support_amount_delta.get(claim_hash, 0))