From ea938b630126c041b550db0f0dbdff0d0b24ea09 Mon Sep 17 00:00:00 2001 From: Aleksey Popov Date: Sat, 21 Apr 2018 21:46:59 +0300 Subject: [PATCH] app.lisk: refactor helpers code --- src/apps/lisk/helpers.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/apps/lisk/helpers.py b/src/apps/lisk/helpers.py index 8ba96587ee..4371ca2c3c 100644 --- a/src/apps/lisk/helpers.py +++ b/src/apps/lisk/helpers.py @@ -4,21 +4,18 @@ LISK_CURVE = 'ed25519' def get_address_from_public_key(public_key): from trezor.crypto.hashlib import sha256 - # logic from lisk-js library - # https://github.com/LiskHQ/lisk-js/blob/115e0e771e8456dc6c1d4acaabba93d975655cfe/lib/transactions/crypto/convert.js#L30 - publicKeyHash = list(sha256(public_key).digest()) - addressData = [] - for i in range(8): - addressData.append(publicKeyHash[7 - i]) - - address = int.from_bytes(bytes(addressData), 'big') + public_key_hash = sha256(public_key).digest() + address = int.from_bytes(public_key_hash[:8], 'little') return str(address) + "L" def get_votes_count(votes): - plus, minus = [], [] + plus, minus = 0, 0 for vote in votes: - plus.append(vote) if vote.startswith('+') else minus.append(vote) - return len(plus), len(minus) + if vote.startswith('+'): + plus += 1 + else: + minus += 1 + return plus, minus def get_vote_tx_text(votes): plus, minus = get_votes_count(votes)