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

fix resolve from tx.id rename

Browse source
This commit is contained in:
Victor Shyba 2018-07-15 15:49:14 -03:00 committed by Jack Robison
parent adc92a2b52
commit c5c1b62939
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lbrynet/wallet/resolve.py
View file

@ -345,7 +345,7 @@ def _verify_proof(name, claim_trie_root, result, height, depth, transaction_clas
if 'transaction' in result: if 'transaction' in result:
tx = transaction_class(raw=unhexlify(result['transaction'])) tx = transaction_class(raw=unhexlify(result['transaction']))
nOut = result['proof']['nOut'] nOut = result['proof']['nOut']
if result['proof']['txhash'] == tx.hex_id: if result['proof']['txhash'] == tx.id:
if 0 <= nOut < len(tx.outputs): if 0 <= nOut < len(tx.outputs):
claim_output = tx.outputs[nOut] claim_output = tx.outputs[nOut]
effective_amount = claim_output.amount + support_amount effective_amount = claim_output.amount + support_amount
@ -356,14 +356,14 @@ def _verify_proof(name, claim_trie_root, result, height, depth, transaction_clas
decoded_name, decoded_value = claim_script.values['claim_name'], claim_script.values['claim'] decoded_name, decoded_value = claim_script.values['claim_name'], claim_script.values['claim']
if decoded_name == name: if decoded_name == name:
return _build_response(name, decoded_value, claim_id, return _build_response(name, decoded_value, claim_id,
tx.hex_id, nOut, claim_output.amount, tx.id, nOut, claim_output.amount,
effective_amount, claim_sequence, effective_amount, claim_sequence,
claim_address, supports) claim_address, supports)
return {'error': 'name in proof did not match requested name'} return {'error': 'name in proof did not match requested name'}
outputs = len(tx['outputs']) outputs = len(tx['outputs'])
return {'error': 'invalid nOut: %d (let(outputs): %d' % (nOut, outputs)} return {'error': 'invalid nOut: %d (let(outputs): %d' % (nOut, outputs)}
return {'error': "computed txid did not match given transaction: %s vs %s" % return {'error': "computed txid did not match given transaction: %s vs %s" %
(tx.hex_id, result['proof']['txhash']) (tx.id, result['proof']['txhash'])
} }
return {'error': "didn't receive a transaction with the proof"} return {'error': "didn't receive a transaction with the proof"}
return {'error': 'name is not claimed'} return {'error': 'name is not claimed'}