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

fixes from review

Browse source
This commit is contained in:
Victor Shyba 2019-04-02 17:07:48 -03:00 committed by Lex Berezhny
parent 36a62d3756
commit 3acabec4bb
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lbrynet/wallet/ledger.py
View file

@ -50,7 +50,7 @@ class MainNetLedger(BaseLedger):
@property
def resolver(self):
return Resolver(self.headers, self.transaction_class, network=self.network, ledger=self)
return Resolver(self)
def resolve(self, page, page_size, *uris):
return self.resolver.resolve(page, page_size, *uris)

20
lbrynet/wallet/resolve.py
View file

@ -17,12 +17,12 @@ log = logging.getLogger(__name__)
class Resolver:
def __init__(self, headers, transaction_class, network, ledger):
self.claim_trie_root = headers.claim_trie_root
self.height = headers.height
self.header_hash = headers.hash().decode()
self.transaction_class = transaction_class
self.network = network
def __init__(self, ledger):
self.claim_trie_root = ledger.headers.claim_trie_root
self.height = ledger.headers.height
self.header_hash = ledger.headers.hash().decode()
self.transaction_class = ledger.transaction_class
self.network = ledger.network
self.ledger = ledger
async def resolve(self, page, page_size, *uris):
@ -73,7 +73,6 @@ class Resolver:
claim_trie_root,
certificate_response,
height, depth,
transaction_class=self.transaction_class,
ledger=self.ledger)
elif certificate_resolution_type not in ['winning', 'claim_id', 'sequence']:
raise Exception(f"unknown response type: {certificate_resolution_type}")
@ -92,7 +91,6 @@ class Resolver:
claim_trie_root,
claim_response,
height, depth,
transaction_class=self.transaction_class,
ledger=self.ledger)
elif claim_resolution_type not in ["sequence", "winning", "claim_id"]:
raise Exception(f"unknown response type: {claim_resolution_type}")
@ -270,7 +268,7 @@ def _get_permanent_url(claim_result, certificate_id):
return f"{claim_result['name']}#{claim_result['claim_id']}"
def _verify_proof(name, claim_trie_root, result, height, depth, transaction_class, ledger):
def _verify_proof(name, claim_trie_root, result, height, depth, ledger):
"""
Verify proof for name claim
"""
@ -297,11 +295,11 @@ def _verify_proof(name, claim_trie_root, result, height, depth, transaction_clas
def _parse_proof_result(name, result):
if 'txhash' in result['proof'] and 'nOut' in result['proof']:
if 'transaction' in result:
tx = transaction_class(raw=unhexlify(result['transaction']))
tx = ledger.transaction_class(raw=unhexlify(result['transaction']))
nOut = result['proof']['nOut']
if result['proof']['txhash'] == tx.id:
if 0 <= nOut < len(tx.outputs):
if tx.outputs[nOut].script.values['claim_name'].decode() == name:
if tx.outputs[nOut].claim_name == name:
return _build_response(name, tx, nOut)
return {'error': 'name in proof did not match requested name'}
outputs = len(tx['outputs'])