From 270d85f2494fecc92c0dc715975f6e4da65eef04 Mon Sep 17 00:00:00 2001 From: Jan Pochyla Date: Thu, 21 Jun 2018 14:00:02 +0200 Subject: [PATCH] seed: cleanup --- src/apps/common/seed.py | 8 ++++---- src/apps/ethereum/sign_tx.py | 6 ------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/apps/common/seed.py b/src/apps/common/seed.py index bd9ae9eb78..818b4b0eed 100644 --- a/src/apps/common/seed.py +++ b/src/apps/common/seed.py @@ -1,3 +1,4 @@ +from micropython import const from trezor import wire from trezor.crypto import bip32, bip39 from apps.common import cache, storage @@ -6,11 +7,10 @@ from apps.common.request_passphrase import protect_by_passphrase _DEFAULT_CURVE = 'secp256k1' -async def derive_node(ctx: wire.Context, path: list, curve_name=_DEFAULT_CURVE): +async def derive_node(ctx: wire.Context, path: list, curve_name: str = _DEFAULT_CURVE) -> bip32.HDNode: seed = await _get_cached_seed(ctx) node = bip32.from_seed(seed, curve_name) - if path: - node.derive_path(path) + node.derive_path(path) return node @@ -31,7 +31,7 @@ async def _get_cached_passphrase(ctx: wire.Context) -> str: return cache.get_passphrase() -def derive_node_without_passphrase(path, curve_name=_DEFAULT_CURVE): +def derive_node_without_passphrase(path: list, curve_name: str = _DEFAULT_CURVE) -> bip32.HDNode: if not storage.is_initialized(): raise Exception('Device is not initialized') diff --git a/src/apps/ethereum/sign_tx.py b/src/apps/ethereum/sign_tx.py index b2e46f44ed..e6c19305f9 100644 --- a/src/apps/ethereum/sign_tx.py +++ b/src/apps/ethereum/sign_tx.py @@ -122,12 +122,6 @@ async def send_signature(ctx, msg: EthereumSignTx, digest): return req -def node_derive(root, address_n: list): - node = root.clone() - node.derive_path(address_n) - return node - - def check(msg: EthereumSignTx): if msg.tx_type not in [1, 6, None]: raise wire.DataError('tx_type out of bounds')