From 70bb0ee04f5445ea8cfec74f661d29913846f1f0 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 28 Sep 2021 00:43:11 +0200 Subject: [PATCH] fix(core): bitcoin-only all_modules.py --- core/.changelog.d/1633.fixed | 1 + core/src/all_modules.py | 6 +++--- core/src/all_modules.py.mako | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 core/.changelog.d/1633.fixed diff --git a/core/.changelog.d/1633.fixed b/core/.changelog.d/1633.fixed new file mode 100644 index 000000000..1a66e573d --- /dev/null +++ b/core/.changelog.d/1633.fixed @@ -0,0 +1 @@ +Remove altcoin message definitions from bitcoin-only build. diff --git a/core/src/all_modules.py b/core/src/all_modules.py index 3faf0f435..d54c0b018 100644 --- a/core/src/all_modules.py +++ b/core/src/all_modules.py @@ -280,8 +280,6 @@ apps.bitcoin.sign_tx.tx_info import apps.bitcoin.sign_tx.tx_info apps.bitcoin.sign_tx.tx_weight import apps.bitcoin.sign_tx.tx_weight -apps.bitcoin.sign_tx.zcash -import apps.bitcoin.sign_tx.zcash apps.bitcoin.verification import apps.bitcoin.verification apps.bitcoin.verify_message @@ -381,7 +379,7 @@ import apps.misc.sign_identity apps.workflow_handlers import apps.workflow_handlers -if utils.BITCOIN_ONLY: +if not utils.BITCOIN_ONLY: trezor.enums.BinanceOrderSide import trezor.enums.BinanceOrderSide trezor.enums.BinanceOrderType @@ -436,6 +434,8 @@ if utils.BITCOIN_ONLY: import apps.binance.layout apps.binance.sign_tx import apps.binance.sign_tx + apps.bitcoin.sign_tx.zcash + import apps.bitcoin.sign_tx.zcash apps.cardano import apps.cardano apps.cardano.address diff --git a/core/src/all_modules.py.mako b/core/src/all_modules.py.mako index 80418614e..d10d041af 100644 --- a/core/src/all_modules.py.mako +++ b/core/src/all_modules.py.mako @@ -28,6 +28,7 @@ ALTCOINS = ( "stellar", "tezos", "webauthn", + "zcash", ) pyfiles = chain.from_iterable(sorted(SRCDIR.glob(p)) for p in PATTERNS) @@ -78,7 +79,7 @@ ${import_name} import ${import_name} % endfor -if utils.BITCOIN_ONLY: +if not utils.BITCOIN_ONLY: % for import_name in imports_altcoin: ${import_name} import ${import_name}