Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

Merge pull request #2960 from lbryio/leaky_ship

Browse source 
fixed bug with leaky information between outputs
This commit is contained in:
Lex Berezhny 2020-05-18 13:21:08 -04:00 committed by GitHub
commit ec141ac9c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lbry/wallet/ledger.py
View file

@ -694,14 +694,26 @@ class Ledger(metaclass=LedgerRegistry):
self.cache_transaction(*tx) for tx in outputs.txs self.cache_transaction(*tx) for tx in outputs.txs
)) ))
txos, blocked = outputs.inflate(txs) _txos, blocked = outputs.inflate(txs)
txos = []
for txo in _txos:
if isinstance(txo, Output):
# transactions and outputs are cached and shared between wallets
# we don't want to leak informaion between wallet so we add the
# wallet specific metadata on throw away copies of the txos
txo = copy.copy(txo)
channel = txo.channel
txo.purchase_receipt = None
txo.update_annotations(None)
txo.channel = channel
txos.append(txo)
includes = ( includes = (
include_purchase_receipt, include_is_my_output, include_purchase_receipt, include_is_my_output,
include_sent_supports, include_sent_tips include_sent_supports, include_sent_tips
) )
if accounts and any(includes): if accounts and any(includes):
copies = []
receipts = {} receipts = {}
if include_purchase_receipt: if include_purchase_receipt:
priced_claims = [] priced_claims = []
@ -718,46 +730,38 @@ class Ledger(metaclass=LedgerRegistry):
} }
for txo in txos: for txo in txos:
if isinstance(txo, Output) and txo.can_decode_claim: if isinstance(txo, Output) and txo.can_decode_claim:
# transactions and outputs are cached and shared between wallets
# we don't want to leak informaion between wallet so we add the
# wallet specific metadata on throw away copies of the txos
txo_copy = copy.copy(txo)
copies.append(txo_copy)
if include_purchase_receipt: if include_purchase_receipt:
txo_copy.purchase_receipt = receipts.get(txo.claim_id) txo.purchase_receipt = receipts.get(txo.claim_id)
if include_is_my_output: if include_is_my_output:
mine = await self.db.get_txo_count( mine = await self.db.get_txo_count(
claim_id=txo.claim_id, txo_type__in=CLAIM_TYPES, is_my_output=True, claim_id=txo.claim_id, txo_type__in=CLAIM_TYPES, is_my_output=True,
is_spent=False, accounts=accounts is_spent=False, accounts=accounts
) )
if mine: if mine:
txo_copy.is_my_output = True txo.is_my_output = True
else: else:
txo_copy.is_my_output = False txo.is_my_output = False
if include_sent_supports: if include_sent_supports:
supports = await self.db.get_txo_sum( supports = await self.db.get_txo_sum(
claim_id=txo.claim_id, txo_type=TXO_TYPES['support'], claim_id=txo.claim_id, txo_type=TXO_TYPES['support'],
is_my_input=True, is_my_output=True, is_my_input=True, is_my_output=True,
is_spent=False, accounts=accounts is_spent=False, accounts=accounts
) )
txo_copy.sent_supports = supports txo.sent_supports = supports
if include_sent_tips: if include_sent_tips:
tips = await self.db.get_txo_sum( tips = await self.db.get_txo_sum(
claim_id=txo.claim_id, txo_type=TXO_TYPES['support'], claim_id=txo.claim_id, txo_type=TXO_TYPES['support'],
is_my_input=True, is_my_output=False, is_my_input=True, is_my_output=False,
accounts=accounts accounts=accounts
) )
txo_copy.sent_tips = tips txo.sent_tips = tips
if include_received_tips: if include_received_tips:
tips = await self.db.get_txo_sum( tips = await self.db.get_txo_sum(
claim_id=txo.claim_id, txo_type=TXO_TYPES['support'], claim_id=txo.claim_id, txo_type=TXO_TYPES['support'],
is_my_input=False, is_my_output=True, is_my_input=False, is_my_output=True,
accounts=accounts accounts=accounts
) )
txo_copy.received_tips = tips txo.received_tips = tips
else:
copies.append(txo)
txos = copies
return txos, blocked, outputs.offset, outputs.total return txos, blocked, outputs.offset, outputs.total
async def resolve(self, accounts, urls, **kwargs): async def resolve(self, accounts, urls, **kwargs):