arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-09 14:12:51 +00:00
Code Issues Releases Wiki Activity

chore: make bitcoin-only checker happy

Browse Source
This commit is contained in:
matejcik 2021-10-25 11:26:23 +02:00 committed by matejcik
parent 2c20016cfa
commit c38efaa9a5
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
core/src/storage/cache.py
View File

@ -22,10 +22,11 @@ _SESSION_ID_LENGTH = 32
APP_COMMON_SEED = 0 APP_COMMON_SEED = 0
APP_COMMON_AUTHORIZATION_TYPE = 1 APP_COMMON_AUTHORIZATION_TYPE = 1
APP_COMMON_AUTHORIZATION_DATA = 2 APP_COMMON_AUTHORIZATION_DATA = 2
APP_COMMON_DERIVE_CARDANO = 3 if not utils.BITCOIN_ONLY:
APP_CARDANO_ICARUS_SECRET = 4 APP_COMMON_DERIVE_CARDANO = 3
APP_CARDANO_ICARUS_TREZOR_SECRET = 5 APP_CARDANO_ICARUS_SECRET = 4
APP_MONERO_LIVE_REFRESH = 6 APP_CARDANO_ICARUS_TREZOR_SECRET = 5
APP_MONERO_LIVE_REFRESH = 6
# Keys that are valid across sessions # Keys that are valid across sessions
APP_COMMON_SEED_WITHOUT_PASSPHRASE = 0 | _SESSIONLESS_FLAG APP_COMMON_SEED_WITHOUT_PASSPHRASE = 0 | _SESSIONLESS_FLAG
@ -91,15 +92,22 @@ class DataCache:
class SessionCache(DataCache): class SessionCache(DataCache):
def __init__(self) -> None: def __init__(self) -> None:
self.session_id = bytearray(_SESSION_ID_LENGTH) self.session_id = bytearray(_SESSION_ID_LENGTH)
self.fields = ( if utils.BITCOIN_ONLY:
64, # APP_COMMON_SEED self.fields = (
2, # APP_COMMON_AUTHORIZATION_TYPE 64, # APP_COMMON_SEED
128, # APP_COMMON_AUTHORIZATION_DATA 2, # APP_COMMON_AUTHORIZATION_TYPE
1, # APP_COMMON_DERIVE_CARDANO 128, # APP_COMMON_AUTHORIZATION_DATA
96, # APP_CARDANO_ICARUS_SECRET )
96, # APP_CARDANO_ICARUS_TREZOR_SECRET else:
1, # APP_MONERO_LIVE_REFRESH self.fields = (
) 64, # APP_COMMON_SEED
2, # APP_COMMON_AUTHORIZATION_TYPE
128, # APP_COMMON_AUTHORIZATION_DATA
1, # APP_COMMON_DERIVE_CARDANO
96, # APP_CARDANO_ICARUS_SECRET
96, # APP_CARDANO_ICARUS_TREZOR_SECRET
1, # APP_MONERO_LIVE_REFRESH
)
self.last_usage = 0 self.last_usage = 0
super().__init__() super().__init__()

3
core/src/trezor/crypto/__init__.py
View File

@ -2,7 +2,6 @@ from trezorcrypto import ( # noqa: F401
aes, aes,
bip32, bip32,
bip39, bip39,
cardano,
chacha20poly1305, chacha20poly1305,
crc, crc,
hmac, hmac,
@ -13,4 +12,4 @@ from trezorcrypto import ( # noqa: F401
from trezor import utils from trezor import utils
if not utils.BITCOIN_ONLY: if not utils.BITCOIN_ONLY:
from trezorcrypto import monero, nem # noqa: F401 from trezorcrypto import cardano, monero, nem # noqa: F401

2
tools/check-bitcoin-only
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
RETURN=0 RETURN=0
EXCEPTIONS="decred|omni|ripple|dash|TEXT_MARGIN_LEFT|APP_CARDANO_PASSPHRASE|APP_MONERO_LIVE_REFRESH|ed25519 cardano|dash_width|dashlane|flo|mnemonic|meter|refuse|fused|enemy|cinema|syntaxerror|mix|palm|UdesRsK|kcc" EXCEPTIONS="decred|omni|ripple|dash|TEXT_MARGIN_LEFT|dash_width|dashlane|flo|mnemonic|meter|refuse|fused|enemy|cinema|syntaxerror|mix|palm|UdesRsK|kcc|derive_cardano"
# dump all coins except the first 3 (Bitcoin, Testnet, Regtest) # dump all coins except the first 3 (Bitcoin, Testnet, Regtest)
ALTCOINS=$(./common/tools/cointool.py dump -l -p -t | grep '"name"' | cut -d '"' -f 4 | tail -n +4) ALTCOINS=$(./common/tools/cointool.py dump -l -p -t | grep '"name"' | cut -d '"' -f 4 | tail -n +4)