From 1746fe06b10bb18aaa3dafdac51873fcceaee3e8 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 27 Feb 2024 11:39:40 +0100 Subject: [PATCH 1/9] docs(core): changelog for 2.6.5 --- core/.changelog.d/3206.added | 1 - core/.changelog.d/3244.fixed | 1 - core/.changelog.d/3434.added | 1 - core/.changelog.d/3440.added | 1 - core/.changelog.d/3445.fixed.1 | 1 - core/.changelog.d/3445.fixed.2 | 1 - core/.changelog.d/3445.fixed.3 | 1 - core/.changelog.d/3458.added | 1 - core/.changelog.d/3475.changed | 1 - core/.changelog.d/3477.fixed | 1 - core/.changelog.d/3517.added | 1 - core/.changelog.d/3539.added | 1 - core/CHANGELOG.T2B1.md | 30 ++++++++++++++++++++++++++++++ core/CHANGELOG.T2T1.md | 32 ++++++++++++++++++++++++++++++++ core/CHANGELOG.md | 31 +++++++++++++++++++++++++++++++ 15 files changed, 93 insertions(+), 12 deletions(-) delete mode 100644 core/.changelog.d/3206.added delete mode 100644 core/.changelog.d/3244.fixed delete mode 100644 core/.changelog.d/3434.added delete mode 100644 core/.changelog.d/3440.added delete mode 100644 core/.changelog.d/3445.fixed.1 delete mode 100644 core/.changelog.d/3445.fixed.2 delete mode 100644 core/.changelog.d/3445.fixed.3 delete mode 100644 core/.changelog.d/3458.added delete mode 100644 core/.changelog.d/3475.changed delete mode 100644 core/.changelog.d/3477.fixed delete mode 100644 core/.changelog.d/3517.added delete mode 100644 core/.changelog.d/3539.added diff --git a/core/.changelog.d/3206.added b/core/.changelog.d/3206.added deleted file mode 100644 index ca8d99654..000000000 --- a/core/.changelog.d/3206.added +++ /dev/null @@ -1 +0,0 @@ -Add translations capability diff --git a/core/.changelog.d/3244.fixed b/core/.changelog.d/3244.fixed deleted file mode 100644 index 452486f41..000000000 --- a/core/.changelog.d/3244.fixed +++ /dev/null @@ -1 +0,0 @@ -[T2T1] Fixed blank display delay on startup when display orientation is set to other than north diff --git a/core/.changelog.d/3434.added b/core/.changelog.d/3434.added deleted file mode 100644 index 49ffffe1f..000000000 --- a/core/.changelog.d/3434.added +++ /dev/null @@ -1 +0,0 @@ -Stellar: add support for StellarClaimClaimableBalanceOp. diff --git a/core/.changelog.d/3440.added b/core/.changelog.d/3440.added deleted file mode 100644 index 903b399bf..000000000 --- a/core/.changelog.d/3440.added +++ /dev/null @@ -1 +0,0 @@ -[T2B1] Add loader to homescreen when locking the device diff --git a/core/.changelog.d/3445.fixed.1 b/core/.changelog.d/3445.fixed.1 deleted file mode 100644 index c12466b00..000000000 --- a/core/.changelog.d/3445.fixed.1 +++ /dev/null @@ -1 +0,0 @@ -Fixed Solana Memo instruction being unknown - it will now be recognized and displayed properly diff --git a/core/.changelog.d/3445.fixed.2 b/core/.changelog.d/3445.fixed.2 deleted file mode 100644 index 10de84ab3..000000000 --- a/core/.changelog.d/3445.fixed.2 +++ /dev/null @@ -1 +0,0 @@ -Solana multisig instruction warning will be displayed before instruction details are displayed diff --git a/core/.changelog.d/3445.fixed.3 b/core/.changelog.d/3445.fixed.3 deleted file mode 100644 index 36d57f6c1..000000000 --- a/core/.changelog.d/3445.fixed.3 +++ /dev/null @@ -1 +0,0 @@ -Improved UI of multiple Solana instructions diff --git a/core/.changelog.d/3458.added b/core/.changelog.d/3458.added deleted file mode 100644 index 7ae079a70..000000000 --- a/core/.changelog.d/3458.added +++ /dev/null @@ -1 +0,0 @@ -Allow for going back to previous word in recovery process diff --git a/core/.changelog.d/3475.changed b/core/.changelog.d/3475.changed deleted file mode 100644 index 0d77c669c..000000000 --- a/core/.changelog.d/3475.changed +++ /dev/null @@ -1 +0,0 @@ -Display descriptors for BTC Taproot public keys. diff --git a/core/.changelog.d/3477.fixed b/core/.changelog.d/3477.fixed deleted file mode 100644 index 1b23a16fe..000000000 --- a/core/.changelog.d/3477.fixed +++ /dev/null @@ -1 +0,0 @@ -[T2B1] Add missing semicolon character to the passphrase entry diff --git a/core/.changelog.d/3517.added b/core/.changelog.d/3517.added deleted file mode 100644 index c5ae5d78c..000000000 --- a/core/.changelog.d/3517.added +++ /dev/null @@ -1 +0,0 @@ -Clear sign ETH staking transactions on Everstake pool. diff --git a/core/.changelog.d/3539.added b/core/.changelog.d/3539.added deleted file mode 100644 index e67334a33..000000000 --- a/core/.changelog.d/3539.added +++ /dev/null @@ -1 +0,0 @@ -Send BIP-380 descriptor in GetPublicKey response. diff --git a/core/CHANGELOG.T2B1.md b/core/CHANGELOG.T2B1.md index ee7c7fb68..8d3ed7ea2 100644 --- a/core/CHANGELOG.T2B1.md +++ b/core/CHANGELOG.T2B1.md @@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [2.6.5] (20th March 2024) + +### Added +- Add translations capability. [#3206] +- Stellar: add support for `StellarClaimClaimableBalanceOp`. [#3434] +- Add loader to homescreen when locking the device. [#3440] +- Allow for going back to previous word in recovery process. [#3458] +- Clear sign ETH staking transactions on Everstake pool. [#3517] +- Send BIP-380 descriptor in GetPublicKey response. [#3539] + +### Changed +- Display descriptors for BTC Taproot public keys. [#3475] + +### Fixed +- Improved UI of multiple Solana instructions. [#3445] +- Solana multisig instruction warning will be displayed before instruction details are displayed. [#3445] +- Fixed Solana Memo instruction being unknown - it will now be recognized and displayed properly. [#3445] +- Add missing semicolon character to the passphrase entry. [#3477] + + ## [2.6.4] (20th December 2023) ### Added @@ -817,10 +837,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). [#3047]: https://github.com/trezor/trezor-firmware/pull/3047 [#3048]: https://github.com/trezor/trezor-firmware/pull/3048 [#3205]: https://github.com/trezor/trezor-firmware/pull/3205 +[#3206]: https://github.com/trezor/trezor-firmware/pull/3206 [#3216]: https://github.com/trezor/trezor-firmware/pull/3216 [#3218]: https://github.com/trezor/trezor-firmware/pull/3218 [#3237]: https://github.com/trezor/trezor-firmware/pull/3237 [#3242]: https://github.com/trezor/trezor-firmware/pull/3242 +[#3244]: https://github.com/trezor/trezor-firmware/pull/3244 [#3246]: https://github.com/trezor/trezor-firmware/pull/3246 [#3255]: https://github.com/trezor/trezor-firmware/pull/3255 [#3256]: https://github.com/trezor/trezor-firmware/pull/3256 @@ -830,3 +852,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). [#3377]: https://github.com/trezor/trezor-firmware/pull/3377 [#3411]: https://github.com/trezor/trezor-firmware/pull/3411 [#3424]: https://github.com/trezor/trezor-firmware/pull/3424 +[#3434]: https://github.com/trezor/trezor-firmware/pull/3434 +[#3440]: https://github.com/trezor/trezor-firmware/pull/3440 +[#3445]: https://github.com/trezor/trezor-firmware/pull/3445 +[#3458]: https://github.com/trezor/trezor-firmware/pull/3458 +[#3475]: https://github.com/trezor/trezor-firmware/pull/3475 +[#3477]: https://github.com/trezor/trezor-firmware/pull/3477 +[#3517]: https://github.com/trezor/trezor-firmware/pull/3517 +[#3539]: https://github.com/trezor/trezor-firmware/pull/3539 diff --git a/core/CHANGELOG.T2T1.md b/core/CHANGELOG.T2T1.md index 5d4cadeea..382315de7 100644 --- a/core/CHANGELOG.T2T1.md +++ b/core/CHANGELOG.T2T1.md @@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [2.6.5] (20th March 2024) + +### Added +- Add translations capability. [#3206] +- Stellar: add support for `StellarClaimClaimableBalanceOp`. [#3434] +- Allow for going back to previous word in recovery process. [#3458] +- Clear sign ETH staking transactions on Everstake pool. [#3517] +- Send BIP-380 descriptor in GetPublicKey response. [#3539] + +### Changed +- Display descriptors for BTC Taproot public keys. [#3475] + +### Fixed +- Fixed blank display delay on startup when display orientation is set to other than north. [#3244] +- Improved UI of multiple Solana instructions. [#3445] +- Solana multisig instruction warning will be displayed before instruction details are displayed. [#3445] +- Fixed Solana Memo instruction being unknown - it will now be recognized and displayed properly. [#3445] + + ## [2.6.4] (20th December 2023) ### Added @@ -12,6 +31,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed - Always display Ethereum fees in Gwei. [#3246] +### Fixed +- Fix invalid encoding of signatures from Optiga. [#3411] + ## [2.6.3] (15th November 2023) @@ -813,10 +835,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). [#3047]: https://github.com/trezor/trezor-firmware/pull/3047 [#3048]: https://github.com/trezor/trezor-firmware/pull/3048 [#3205]: https://github.com/trezor/trezor-firmware/pull/3205 +[#3206]: https://github.com/trezor/trezor-firmware/pull/3206 [#3216]: https://github.com/trezor/trezor-firmware/pull/3216 [#3218]: https://github.com/trezor/trezor-firmware/pull/3218 [#3237]: https://github.com/trezor/trezor-firmware/pull/3237 [#3242]: https://github.com/trezor/trezor-firmware/pull/3242 +[#3244]: https://github.com/trezor/trezor-firmware/pull/3244 [#3246]: https://github.com/trezor/trezor-firmware/pull/3246 [#3255]: https://github.com/trezor/trezor-firmware/pull/3255 [#3256]: https://github.com/trezor/trezor-firmware/pull/3256 @@ -826,3 +850,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). [#3377]: https://github.com/trezor/trezor-firmware/pull/3377 [#3411]: https://github.com/trezor/trezor-firmware/pull/3411 [#3424]: https://github.com/trezor/trezor-firmware/pull/3424 +[#3434]: https://github.com/trezor/trezor-firmware/pull/3434 +[#3440]: https://github.com/trezor/trezor-firmware/pull/3440 +[#3445]: https://github.com/trezor/trezor-firmware/pull/3445 +[#3458]: https://github.com/trezor/trezor-firmware/pull/3458 +[#3475]: https://github.com/trezor/trezor-firmware/pull/3475 +[#3477]: https://github.com/trezor/trezor-firmware/pull/3477 +[#3517]: https://github.com/trezor/trezor-firmware/pull/3517 +[#3539]: https://github.com/trezor/trezor-firmware/pull/3539 diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index 80d48b580..90ba4cf36 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -4,6 +4,27 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [2.6.5] (20th March 2024) + +### Added +- Add translations capability. [#3206] +- Stellar: add support for `StellarClaimClaimableBalanceOp`. [#3434] +- [T2B1] Add loader to homescreen when locking the device. [#3440] +- Allow for going back to previous word in recovery process. [#3458] +- Clear sign ETH staking transactions on Everstake pool. [#3517] +- Send BIP-380 descriptor in GetPublicKey response. [#3539] + +### Changed +- Display descriptors for BTC Taproot public keys. [#3475] + +### Fixed +- [T2T1] Fixed blank display delay on startup when display orientation is set to other than north. [#3244] +- Improved UI of multiple Solana instructions. [#3445] +- Solana multisig instruction warning will be displayed before instruction details are displayed. [#3445] +- Fixed Solana Memo instruction being unknown - it will now be recognized and displayed properly. [#3445] +- [T2B1] Add missing semicolon character to the passphrase entry. [#3477] + + ## [2.6.4] (20th December 2023) ### Added @@ -822,10 +843,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). [#3047]: https://github.com/trezor/trezor-firmware/pull/3047 [#3048]: https://github.com/trezor/trezor-firmware/pull/3048 [#3205]: https://github.com/trezor/trezor-firmware/pull/3205 +[#3206]: https://github.com/trezor/trezor-firmware/pull/3206 [#3216]: https://github.com/trezor/trezor-firmware/pull/3216 [#3218]: https://github.com/trezor/trezor-firmware/pull/3218 [#3237]: https://github.com/trezor/trezor-firmware/pull/3237 [#3242]: https://github.com/trezor/trezor-firmware/pull/3242 +[#3244]: https://github.com/trezor/trezor-firmware/pull/3244 [#3246]: https://github.com/trezor/trezor-firmware/pull/3246 [#3255]: https://github.com/trezor/trezor-firmware/pull/3255 [#3256]: https://github.com/trezor/trezor-firmware/pull/3256 @@ -835,3 +858,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). [#3377]: https://github.com/trezor/trezor-firmware/pull/3377 [#3411]: https://github.com/trezor/trezor-firmware/pull/3411 [#3424]: https://github.com/trezor/trezor-firmware/pull/3424 +[#3434]: https://github.com/trezor/trezor-firmware/pull/3434 +[#3440]: https://github.com/trezor/trezor-firmware/pull/3440 +[#3445]: https://github.com/trezor/trezor-firmware/pull/3445 +[#3458]: https://github.com/trezor/trezor-firmware/pull/3458 +[#3475]: https://github.com/trezor/trezor-firmware/pull/3475 +[#3477]: https://github.com/trezor/trezor-firmware/pull/3477 +[#3517]: https://github.com/trezor/trezor-firmware/pull/3517 +[#3539]: https://github.com/trezor/trezor-firmware/pull/3539 From 6b821a8cd5c0742a622c6c36fdfc3daba650e2fc Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 27 Feb 2024 17:10:42 +0100 Subject: [PATCH 2/9] chore(common): set definition timestamp to the current signed definitions [no changelog] --- common/defs/ethereum/released-definitions-timestamp.txt | 2 +- core/src/apps/ethereum/definitions_constants.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/defs/ethereum/released-definitions-timestamp.txt b/common/defs/ethereum/released-definitions-timestamp.txt index 5d703ab7b..576ad7435 100644 --- a/common/defs/ethereum/released-definitions-timestamp.txt +++ b/common/defs/ethereum/released-definitions-timestamp.txt @@ -1 +1 @@ -2023-11-30T09:48:08+00:00 +2024-01-03T12:26:50+00:00 diff --git a/core/src/apps/ethereum/definitions_constants.py b/core/src/apps/ethereum/definitions_constants.py index c4e153101..68b7ff4b8 100644 --- a/core/src/apps/ethereum/definitions_constants.py +++ b/core/src/apps/ethereum/definitions_constants.py @@ -9,7 +9,7 @@ PUBLIC_KEYS = ( b"\xb8\xd2\xb2\x1d\xe2\x71\x24\xf0\x51\x1f\x90\x3a\xe7\xe6\x0e\x07\x96\x18\x10\xa0\xb8\xf2\x8e\xa7\x55\xfa\x50\x36\x7a\x8a\x2b\x8b", ) -MIN_DATA_VERSION = 1701337688 +MIN_DATA_VERSION = 1704284810 FORMAT_VERSION = b"trzd1" if __debug__: From 1fddb0b4986c0654ad235ec76cedfd25d7418884 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Wed, 28 Feb 2024 21:37:31 +0100 Subject: [PATCH 3/9] feat(core): Add Capability.Translations to Features [no changelog] (cherry picked from commit 48124023d7f1a9b0d3e2255a1ec6dd1ec71ea196) --- common/protob/messages-management.proto | 1 + core/src/apps/base.py | 2 ++ core/src/trezor/enums/Capability.py | 1 + core/src/trezor/enums/__init__.py | 1 + python/src/trezorlib/messages.py | 1 + .../protos/generated/messages_management.rs | 35 +++++++++++-------- tests/device_tests/test_basic.py | 8 ++++- tests/ui_tests/fixtures.json | 11 ++++++ 8 files changed, 45 insertions(+), 15 deletions(-) diff --git a/common/protob/messages-management.proto b/common/protob/messages-management.proto index c9a47a5b0..e2c084175 100644 --- a/common/protob/messages-management.proto +++ b/common/protob/messages-management.proto @@ -111,6 +111,7 @@ message Features { Capability_ShamirGroups = 16 [(bitcoin_only) = true]; Capability_PassphraseEntry = 17 [(bitcoin_only) = true]; // the device is capable of passphrase entry directly on the device Capability_Solana = 18; + Capability_Translations = 19 [(bitcoin_only) = true]; } optional BackupType backup_type = 31; // type of device backup (BIP-39 / SLIP-39 basic / SLIP-39 advanced) optional bool sd_card_present = 32; // is SD card present diff --git a/core/src/apps/base.py b/core/src/apps/base.py index 27d0c16b7..4ba716ce4 100644 --- a/core/src/apps/base.py +++ b/core/src/apps/base.py @@ -103,6 +103,7 @@ def get_features() -> Features: Capability.Shamir, Capability.ShamirGroups, Capability.PassphraseEntry, + Capability.Translations, ] else: f.capabilities = [ @@ -121,6 +122,7 @@ def get_features() -> Features: Capability.ShamirGroups, Capability.PassphraseEntry, Capability.Solana, + Capability.Translations, ] # We do not support some currencies on T2B1 diff --git a/core/src/trezor/enums/Capability.py b/core/src/trezor/enums/Capability.py index 9ebc7dc05..5cc5dbddd 100644 --- a/core/src/trezor/enums/Capability.py +++ b/core/src/trezor/enums/Capability.py @@ -9,6 +9,7 @@ Crypto = 5 Shamir = 15 ShamirGroups = 16 PassphraseEntry = 17 +Translations = 19 if not utils.BITCOIN_ONLY: Bitcoin_like = 2 Binance = 3 diff --git a/core/src/trezor/enums/__init__.py b/core/src/trezor/enums/__init__.py index cce49799f..3335f1b27 100644 --- a/core/src/trezor/enums/__init__.py +++ b/core/src/trezor/enums/__init__.py @@ -446,6 +446,7 @@ if TYPE_CHECKING: ShamirGroups = 16 PassphraseEntry = 17 Solana = 18 + Translations = 19 class SdProtectOperationType(IntEnum): DISABLE = 0 diff --git a/python/src/trezorlib/messages.py b/python/src/trezorlib/messages.py index f53d426df..a8ae02096 100644 --- a/python/src/trezorlib/messages.py +++ b/python/src/trezorlib/messages.py @@ -477,6 +477,7 @@ class Capability(IntEnum): ShamirGroups = 16 PassphraseEntry = 17 Solana = 18 + Translations = 19 class SdProtectOperationType(IntEnum): diff --git a/rust/trezor-client/src/protos/generated/messages_management.rs b/rust/trezor-client/src/protos/generated/messages_management.rs index 12bf9495f..c163b5ea7 100644 --- a/rust/trezor-client/src/protos/generated/messages_management.rs +++ b/rust/trezor-client/src/protos/generated/messages_management.rs @@ -2453,6 +2453,8 @@ pub mod features { Capability_PassphraseEntry = 17, // @@protoc_insertion_point(enum_value:hw.trezor.messages.management.Features.Capability.Capability_Solana) Capability_Solana = 18, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.management.Features.Capability.Capability_Translations) + Capability_Translations = 19, } impl ::protobuf::Enum for Capability { @@ -2482,6 +2484,7 @@ pub mod features { 16 => ::std::option::Option::Some(Capability::Capability_ShamirGroups), 17 => ::std::option::Option::Some(Capability::Capability_PassphraseEntry), 18 => ::std::option::Option::Some(Capability::Capability_Solana), + 19 => ::std::option::Option::Some(Capability::Capability_Translations), _ => ::std::option::Option::None } } @@ -2506,6 +2509,7 @@ pub mod features { "Capability_ShamirGroups" => ::std::option::Option::Some(Capability::Capability_ShamirGroups), "Capability_PassphraseEntry" => ::std::option::Option::Some(Capability::Capability_PassphraseEntry), "Capability_Solana" => ::std::option::Option::Some(Capability::Capability_Solana), + "Capability_Translations" => ::std::option::Option::Some(Capability::Capability_Translations), _ => ::std::option::Option::None } } @@ -2529,6 +2533,7 @@ pub mod features { Capability::Capability_ShamirGroups, Capability::Capability_PassphraseEntry, Capability::Capability_Solana, + Capability::Capability_Translations, ]; } @@ -2558,6 +2563,7 @@ pub mod features { Capability::Capability_ShamirGroups => 15, Capability::Capability_PassphraseEntry => 16, Capability::Capability_Solana => 17, + Capability::Capability_Translations => 18, }; Self::enum_descriptor().value_by_index(index) } @@ -10305,7 +10311,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x0emessages.proto\"\x80\x01\n\nInitialize\x12\x1d\n\nsession_id\x18\x01\ \x20\x01(\x0cR\tsessionId\x12,\n\x10_skip_passphrase\x18\x02\x20\x01(\ \x08R\x0eSkipPassphraseB\x02\x18\x01\x12%\n\x0ederive_cardano\x18\x03\ - \x20\x01(\x08R\rderiveCardano\"\r\n\x0bGetFeatures\"\xb0\x13\n\x08Featur\ + \x20\x01(\x08R\rderiveCardano\"\r\n\x0bGetFeatures\"\xd3\x13\n\x08Featur\ es\x12\x16\n\x06vendor\x18\x01\x20\x01(\tR\x06vendor\x12#\n\rmajor_versi\ on\x18\x02\x20\x02(\rR\x0cmajorVersion\x12#\n\rminor_version\x18\x03\x20\ \x02(\rR\x0cminorVersion\x12#\n\rpatch_version\x18\x04\x20\x02(\rR\x0cpa\ @@ -10349,7 +10355,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ n_width\x18/\x20\x01(\rR\x0fhomescreenWidth\x12+\n\x11homescreen_height\ \x180\x20\x01(\rR\x10homescreenHeight\x12+\n\x11bootloader_locked\x181\ \x20\x01(\x08R\x10bootloaderLocked\x12>\n\x18language_version_matches\ - \x182\x20\x01(\x08:\x04trueR\x16languageVersionMatches\"\xe1\x03\n\nCapa\ + \x182\x20\x01(\x08:\x04trueR\x16languageVersionMatches\"\x84\x04\n\nCapa\ bility\x12\x1c\n\x12Capability_Bitcoin\x10\x01\x1a\x04\x80\xa6\x1d\x01\ \x12\x1b\n\x17Capability_Bitcoin_like\x10\x02\x12\x16\n\x12Capability_Bi\ nance\x10\x03\x12\x16\n\x12Capability_Cardano\x10\x04\x12\x1b\n\x11Capab\ @@ -10361,18 +10367,19 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x10\r\x12\x12\n\x0eCapability_U2F\x10\x0e\x12\x1b\n\x11Capability_Shami\ r\x10\x0f\x1a\x04\x80\xa6\x1d\x01\x12!\n\x17Capability_ShamirGroups\x10\ \x10\x1a\x04\x80\xa6\x1d\x01\x12$\n\x1aCapability_PassphraseEntry\x10\ - \x11\x1a\x04\x80\xa6\x1d\x01\x12\x15\n\x11Capability_Solana\x10\x12\x1a\ - \x04\xc8\xf3\x18\x01\"\x0c\n\nLockDevice\"&\n\x07SetBusy\x12\x1b\n\texpi\ - ry_ms\x18\x01\x20\x01(\rR\x08expiryMs\"\x0c\n\nEndSession\"\x9b\x04\n\rA\ - pplySettings\x12\x1e\n\x08language\x18\x01\x20\x01(\tR\x08languageB\x02\ - \x18\x01\x12\x14\n\x05label\x18\x02\x20\x01(\tR\x05label\x12%\n\x0euse_p\ - assphrase\x18\x03\x20\x01(\x08R\rusePassphrase\x12\x1e\n\nhomescreen\x18\ - \x04\x20\x01(\x0cR\nhomescreen\x120\n\x12_passphrase_source\x18\x05\x20\ - \x01(\rR\x10PassphraseSourceB\x02\x18\x01\x12+\n\x12auto_lock_delay_ms\ - \x18\x06\x20\x01(\rR\x0fautoLockDelayMs\x12)\n\x10display_rotation\x18\ - \x07\x20\x01(\rR\x0fdisplayRotation\x12=\n\x1bpassphrase_always_on_devic\ - e\x18\x08\x20\x01(\x08R\x18passphraseAlwaysOnDevice\x12T\n\rsafety_check\ - s\x18\t\x20\x01(\x0e2/.hw.trezor.messages.management.SafetyCheckLevelR\ + \x11\x1a\x04\x80\xa6\x1d\x01\x12\x15\n\x11Capability_Solana\x10\x12\x12!\ + \n\x17Capability_Translations\x10\x13\x1a\x04\x80\xa6\x1d\x01\x1a\x04\ + \xc8\xf3\x18\x01\"\x0c\n\nLockDevice\"&\n\x07SetBusy\x12\x1b\n\texpiry_m\ + s\x18\x01\x20\x01(\rR\x08expiryMs\"\x0c\n\nEndSession\"\x9b\x04\n\rApply\ + Settings\x12\x1e\n\x08language\x18\x01\x20\x01(\tR\x08languageB\x02\x18\ + \x01\x12\x14\n\x05label\x18\x02\x20\x01(\tR\x05label\x12%\n\x0euse_passp\ + hrase\x18\x03\x20\x01(\x08R\rusePassphrase\x12\x1e\n\nhomescreen\x18\x04\ + \x20\x01(\x0cR\nhomescreen\x120\n\x12_passphrase_source\x18\x05\x20\x01(\ + \rR\x10PassphraseSourceB\x02\x18\x01\x12+\n\x12auto_lock_delay_ms\x18\ + \x06\x20\x01(\rR\x0fautoLockDelayMs\x12)\n\x10display_rotation\x18\x07\ + \x20\x01(\rR\x0fdisplayRotation\x12=\n\x1bpassphrase_always_on_device\ + \x18\x08\x20\x01(\x08R\x18passphraseAlwaysOnDevice\x12T\n\rsafety_checks\ + \x18\t\x20\x01(\x0e2/.hw.trezor.messages.management.SafetyCheckLevelR\ \x0csafetyChecks\x123\n\x15experimental_features\x18\n\x20\x01(\x08R\x14\ experimentalFeatures\x129\n\x19hide_passphrase_from_host\x18\x0b\x20\x01\ (\x08R\x16hidePassphraseFromHost\"T\n\x0eChangeLanguage\x12\x1f\n\x0bdat\ diff --git a/tests/device_tests/test_basic.py b/tests/device_tests/test_basic.py index 356759797..c2d1202eb 100644 --- a/tests/device_tests/test_basic.py +++ b/tests/device_tests/test_basic.py @@ -14,7 +14,7 @@ # You should have received a copy of the License along with this library. # If not, see . -from trezorlib import device, messages +from trezorlib import device, messages, models from trezorlib.debuglink import TrezorClientDebugLink as Client @@ -26,6 +26,12 @@ def test_features(client: Client): assert f0 == f1 +def test_capabilities(client: Client): + assert (messages.Capability.Translations in client.features.capabilities) == ( + client.model is not models.T1B1 + ) + + def test_ping(client: Client): ping = client.call(messages.Ping(message="ahoj!")) assert ping == messages.Success(message="ahoj!") diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json index 80636830c..8f156e5ec 100644 --- a/tests/ui_tests/fixtures.json +++ b/tests/ui_tests/fixtures.json @@ -640,6 +640,7 @@ "T1_en_test_autolock.py::test_autolock_default_value": "cde0dd7c453463cbfbb6bb35289fca350efd43511f2701b634c0fbb81f7d9dec", "T1_en_test_autolock.py::test_autolock_ignores_getaddress": "4f24424b5a55618ecc6d3e57a96071a222892dcef874428c3914ab86eca98c77", "T1_en_test_autolock.py::test_autolock_ignores_initialize": "4f24424b5a55618ecc6d3e57a96071a222892dcef874428c3914ab86eca98c77", +"T1_en_test_basic.py::test_capabilities": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "T1_en_test_basic.py::test_device_id_different": "aac15a6d12d21966c77572aeebd56ebc2a47ecba3a508f5a421af2a5da2919e7", "T1_en_test_basic.py::test_device_id_same": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "T1_en_test_basic.py::test_features": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", @@ -2150,6 +2151,7 @@ "TR_cs_test_autolock.py::test_autolock_default_value": "2cf032b5e7ea2994acb9e0121c1e10dff929dc572a5a7528cbf29b49110a5ef2", "TR_cs_test_autolock.py::test_autolock_ignores_getaddress": "f41f9fc64537c29f6f530ced022d28fe9f713ae31babe974d9b0795edd5adf7e", "TR_cs_test_autolock.py::test_autolock_ignores_initialize": "f41f9fc64537c29f6f530ced022d28fe9f713ae31babe974d9b0795edd5adf7e", +"TR_cs_test_basic.py::test_capabilities": "cb2b7df43c09354e4c03fa6f0286109ac5051752699e8ca5c230cdc0445af2ed", "TR_cs_test_basic.py::test_device_id_different": "bec90ea7be13f6437adf5c70496bb66def054ef2919d7b9ec3a131e00acfea6f", "TR_cs_test_basic.py::test_device_id_same": "cb2b7df43c09354e4c03fa6f0286109ac5051752699e8ca5c230cdc0445af2ed", "TR_cs_test_basic.py::test_features": "cb2b7df43c09354e4c03fa6f0286109ac5051752699e8ca5c230cdc0445af2ed", @@ -3494,6 +3496,7 @@ "TR_de_test_autolock.py::test_autolock_default_value": "d3866c3a7a71d5141f2bb3dc5cd4391e374c68a3731396fdd0424e2f3e5203c9", "TR_de_test_autolock.py::test_autolock_ignores_getaddress": "51615badba3006364c3dabd47c492854d554feb1d3b6e181f974c1ac8bcefc1f", "TR_de_test_autolock.py::test_autolock_ignores_initialize": "51615badba3006364c3dabd47c492854d554feb1d3b6e181f974c1ac8bcefc1f", +"TR_de_test_basic.py::test_capabilities": "9bdb526d0b64a91e862ec4ba7ced36adf20382a193c8f0c5788a70564aeac23a", "TR_de_test_basic.py::test_device_id_different": "fa2c0c07f4ec4380d9539b8553d342c33d856fd6de71125519a32f11534a3ec3", "TR_de_test_basic.py::test_device_id_same": "9bdb526d0b64a91e862ec4ba7ced36adf20382a193c8f0c5788a70564aeac23a", "TR_de_test_basic.py::test_features": "9bdb526d0b64a91e862ec4ba7ced36adf20382a193c8f0c5788a70564aeac23a", @@ -4856,6 +4859,7 @@ "TR_en_test_autolock.py::test_autolock_default_value": "d810436f4404563b1a3dda410cbda2f42969ef6bc746b85fefc6fce2fe835369", "TR_en_test_autolock.py::test_autolock_ignores_getaddress": "c5e41fe24ab50d93b40d5ce91a2b4232cef22046ea0d6c0e01603b01a333ada6", "TR_en_test_autolock.py::test_autolock_ignores_initialize": "c5e41fe24ab50d93b40d5ce91a2b4232cef22046ea0d6c0e01603b01a333ada6", +"TR_en_test_basic.py::test_capabilities": "8c801bd0142e5c1ad4aad50b34c7debb1b8f17a2e0a87eb7f95531b9fd15e095", "TR_en_test_basic.py::test_device_id_different": "0abb37c5dd2cc89e22f3952cfec9191413873c9c291df8c8a43a7c89f23b5fd5", "TR_en_test_basic.py::test_device_id_same": "8c801bd0142e5c1ad4aad50b34c7debb1b8f17a2e0a87eb7f95531b9fd15e095", "TR_en_test_basic.py::test_features": "8c801bd0142e5c1ad4aad50b34c7debb1b8f17a2e0a87eb7f95531b9fd15e095", @@ -6200,6 +6204,7 @@ "TR_es_test_autolock.py::test_autolock_default_value": "927810786eb074d1cc988911dbc29ae74d6f00aa29d1cd599bc5f17a16069919", "TR_es_test_autolock.py::test_autolock_ignores_getaddress": "301168c91c5445413aea30cde335975b85e9e716adc04d9a02700d61b777a72b", "TR_es_test_autolock.py::test_autolock_ignores_initialize": "301168c91c5445413aea30cde335975b85e9e716adc04d9a02700d61b777a72b", +"TR_es_test_basic.py::test_capabilities": "5e88affdb4b3898af738bfabb224b94e674c0d5b8bd6ea4f73a601c972f5858c", "TR_es_test_basic.py::test_device_id_different": "9f7fac6440897a401ba3f318edb6278403e5c80f69e7d493553f0eb9e6a70382", "TR_es_test_basic.py::test_device_id_same": "5e88affdb4b3898af738bfabb224b94e674c0d5b8bd6ea4f73a601c972f5858c", "TR_es_test_basic.py::test_features": "5e88affdb4b3898af738bfabb224b94e674c0d5b8bd6ea4f73a601c972f5858c", @@ -7544,6 +7549,7 @@ "TR_fr_test_autolock.py::test_autolock_default_value": "3643f7de60feef3c64f48f2eab351b884581b011753fbab6a195e22278ce40ef", "TR_fr_test_autolock.py::test_autolock_ignores_getaddress": "5ff13140edeb1beb2e18aab3e9615eb974608600688c4197583cdfddd3bd10fc", "TR_fr_test_autolock.py::test_autolock_ignores_initialize": "5ff13140edeb1beb2e18aab3e9615eb974608600688c4197583cdfddd3bd10fc", +"TR_fr_test_basic.py::test_capabilities": "3bbca7f9b0cc44dd18b1fb71d34dec0542b8ac69e022cf4cd1f2792a41b4fb20", "TR_fr_test_basic.py::test_device_id_different": "13e6884d46c72f52d0b084923e11044e76bf287129f8e81530f6fbe66f9c428e", "TR_fr_test_basic.py::test_device_id_same": "3bbca7f9b0cc44dd18b1fb71d34dec0542b8ac69e022cf4cd1f2792a41b4fb20", "TR_fr_test_basic.py::test_features": "3bbca7f9b0cc44dd18b1fb71d34dec0542b8ac69e022cf4cd1f2792a41b4fb20", @@ -9195,6 +9201,7 @@ "TT_cs_test_autolock.py::test_autolock_default_value": "c0e766094ced5d92e93b13549efea2b4eeaaf1527288224c1a55b3e5b5b42c40", "TT_cs_test_autolock.py::test_autolock_ignores_getaddress": "3397142387fe4c8fedb16a5a4d37f34366417d8505b38ade99a2b13959af96a6", "TT_cs_test_autolock.py::test_autolock_ignores_initialize": "3397142387fe4c8fedb16a5a4d37f34366417d8505b38ade99a2b13959af96a6", +"TT_cs_test_basic.py::test_capabilities": "56f6f2887f3022efefed50e9c478040b38762e8a120586df0f1cea4941f5c34b", "TT_cs_test_basic.py::test_device_id_different": "797083da15c42b7da1b2f4b4e9c86384aaf495cfd2148ae7af4f7db92621e2f8", "TT_cs_test_basic.py::test_device_id_same": "56f6f2887f3022efefed50e9c478040b38762e8a120586df0f1cea4941f5c34b", "TT_cs_test_basic.py::test_features": "56f6f2887f3022efefed50e9c478040b38762e8a120586df0f1cea4941f5c34b", @@ -10619,6 +10626,7 @@ "TT_de_test_autolock.py::test_autolock_default_value": "990c021d0d76f73a9184369fd743ac16f0b6ddf3ce90af1aace16777ae23c52f", "TT_de_test_autolock.py::test_autolock_ignores_getaddress": "d9163d1565b2fa43ee0fabe50b92f9be131cd43b113f4f462aa8b05c90be091a", "TT_de_test_autolock.py::test_autolock_ignores_initialize": "d9163d1565b2fa43ee0fabe50b92f9be131cd43b113f4f462aa8b05c90be091a", +"TT_de_test_basic.py::test_capabilities": "4ed24353a7aa99e894d4ed3cb45be13f54a94577289f3919be62add4c6c36390", "TT_de_test_basic.py::test_device_id_different": "b17901702c0399a7ca6ed20ae39b8eb6bbae5d74a15d38c2868febaecdbad328", "TT_de_test_basic.py::test_device_id_same": "4ed24353a7aa99e894d4ed3cb45be13f54a94577289f3919be62add4c6c36390", "TT_de_test_basic.py::test_features": "4ed24353a7aa99e894d4ed3cb45be13f54a94577289f3919be62add4c6c36390", @@ -12061,6 +12069,7 @@ "TT_en_test_autolock.py::test_autolock_default_value": "26456e47387df96753a31089b42925fa24d29604564d9145a0a40e7eed03b04d", "TT_en_test_autolock.py::test_autolock_ignores_getaddress": "2d1ca9c45112dad7e5bbb908baa086b02547a3e710fab8eff79551e63e19b790", "TT_en_test_autolock.py::test_autolock_ignores_initialize": "2d1ca9c45112dad7e5bbb908baa086b02547a3e710fab8eff79551e63e19b790", +"TT_en_test_basic.py::test_capabilities": "80a6e289138a604cf351a29511cf6f85e2243591317894703152787e1351a1a3", "TT_en_test_basic.py::test_device_id_different": "a2311d35eab312a51948f62e75484cb352c7794764403812a33acc9bfc89ca73", "TT_en_test_basic.py::test_device_id_same": "80a6e289138a604cf351a29511cf6f85e2243591317894703152787e1351a1a3", "TT_en_test_basic.py::test_features": "80a6e289138a604cf351a29511cf6f85e2243591317894703152787e1351a1a3", @@ -13503,6 +13512,7 @@ "TT_es_test_autolock.py::test_autolock_default_value": "02be3ec680cda907c1d2bdb7568966bbfe51a2dd8e575cb61548941d77b9289e", "TT_es_test_autolock.py::test_autolock_ignores_getaddress": "6742759bce4335b47bbb6ab11763d58829bcd4f47810f16f48ab90d407c4ee27", "TT_es_test_autolock.py::test_autolock_ignores_initialize": "6742759bce4335b47bbb6ab11763d58829bcd4f47810f16f48ab90d407c4ee27", +"TT_es_test_basic.py::test_capabilities": "3d2d3c815bfd09c3235e3749e66769dc375f49f9cc92f13f4a7b7df38e6bcfab", "TT_es_test_basic.py::test_device_id_different": "6b89cf6b8e0af123d0f64761dc06bc97f14ed1a83a66473453ae8afa74bd9786", "TT_es_test_basic.py::test_device_id_same": "3d2d3c815bfd09c3235e3749e66769dc375f49f9cc92f13f4a7b7df38e6bcfab", "TT_es_test_basic.py::test_features": "3d2d3c815bfd09c3235e3749e66769dc375f49f9cc92f13f4a7b7df38e6bcfab", @@ -14927,6 +14937,7 @@ "TT_fr_test_autolock.py::test_autolock_default_value": "18fe4ca2286a608313430e59ac8c56daec9f096960c10a0bedecf427f9fa2e9c", "TT_fr_test_autolock.py::test_autolock_ignores_getaddress": "6355be29769b7ced748606e8cd9aab0ab9b651a5a24e39765e8a5da4c9767a1c", "TT_fr_test_autolock.py::test_autolock_ignores_initialize": "6355be29769b7ced748606e8cd9aab0ab9b651a5a24e39765e8a5da4c9767a1c", +"TT_fr_test_basic.py::test_capabilities": "5c03427cb7e315cb2f1e036c2edb2cc7c527ac80783c331fda0749bf306bcd94", "TT_fr_test_basic.py::test_device_id_different": "4319b6013ad542a90cf01faac389609f5967202eb6d846ca5aeac343cf03c934", "TT_fr_test_basic.py::test_device_id_same": "5c03427cb7e315cb2f1e036c2edb2cc7c527ac80783c331fda0749bf306bcd94", "TT_fr_test_basic.py::test_features": "5c03427cb7e315cb2f1e036c2edb2cc7c527ac80783c331fda0749bf306bcd94", From 6ae158cac9909e384349a15b3a9e7218b6aa1c1d Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Wed, 28 Feb 2024 23:07:03 +0100 Subject: [PATCH 4/9] fix(core): workaround umlauts not being cleared [no changelog] (cherry picked from commit d790354667939143c65cbcbbb0508387ad33420c) --- .../rust/src/ui/model_tt/component/loader.rs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/core/embed/rust/src/ui/model_tt/component/loader.rs b/core/embed/rust/src/ui/model_tt/component/loader.rs index 20eac6046..d661653b7 100644 --- a/core/embed/rust/src/ui/model_tt/component/loader.rs +++ b/core/embed/rust/src/ui/model_tt/component/loader.rs @@ -32,6 +32,7 @@ pub struct Loader { growing_duration: Duration, shrinking_duration: Duration, styles: LoaderStyleSheet, + offset_y: i16, } impl Loader { @@ -54,6 +55,7 @@ impl Loader { growing_duration: Duration::from_millis(GROWING_DURATION_MS), shrinking_duration: Duration::from_millis(SHRINKING_DURATION_MS), styles, + offset_y: 0, } } @@ -140,7 +142,15 @@ impl Component for Loader { type Msg = LoaderMsg; fn place(&mut self, bounds: Rect) -> Rect { - self.pad.place(bounds); + // Current loader API only takes Y-offset relative to screen center, which we + // compute from the bounds center point. + let screen_center = constant::screen().center(); + self.offset_y = bounds.center().y - screen_center.y; + + // FIXME: avoid umlauts rendering outside bounds + let mut bounds_up_to_top = bounds; + bounds_up_to_top.y0 = 0; + self.pad.place(bounds_up_to_top); Rect::from_center_and_size(bounds.center(), Self::SIZE) } @@ -182,15 +192,10 @@ impl Component for Loader { self.styles.active }; - // Current loader API only takes Y-offset relative to screen center, which we - // compute from the bounds center point. - let screen_center = constant::screen().center(); - let offset_y = self.pad.area.center().y - screen_center.y; - self.pad.paint(); display::loader( progress, - offset_y, + self.offset_y, style.loader_color, style.background_color, style.icon, From a784c4046e79ae138f9a7a9c5e97d2f6771140eb Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 29 Feb 2024 14:40:02 +0100 Subject: [PATCH 5/9] ci: allow running workflows manually [skip_ci] (cherry picked from commit 4c40cb279cfdb44aa0e7753cb2c188ccd1750a30) --- .github/workflows/core.yml | 4 +++- .github/workflows/legacy.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 42af122cb..57f55285a 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -1,6 +1,8 @@ name: Core -on: [pull_request] +on: + pull_request: + workflow_dispatch: permissions: id-token: write # for fetching the OIDC token diff --git a/.github/workflows/legacy.yml b/.github/workflows/legacy.yml index 2d5a801a3..c5725cc77 100644 --- a/.github/workflows/legacy.yml +++ b/.github/workflows/legacy.yml @@ -1,6 +1,8 @@ name: Legacy -on: [pull_request] +on: + pull_request: + workflow_dispatch: permissions: id-token: write # for fetching the OIDC token From 1f67c1e55ca2fcf47ce6b28aff75303a8dc19187 Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Fri, 1 Mar 2024 14:13:36 +0100 Subject: [PATCH 6/9] chore(core): bump fw and fix version due to storage migration [no changelog] (cherry picked from commit ffabee2e6aefaadf0e3a1793fdeb2447a9c975bb) --- core/embed/firmware/version.h | 6 +++--- core/translations/cs.json | 2 +- core/translations/de.json | 2 +- core/translations/en.json | 2 +- core/translations/es.json | 2 +- core/translations/fr.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/embed/firmware/version.h b/core/embed/firmware/version.h index c6b3e106c..275cde27d 100644 --- a/core/embed/firmware/version.h +++ b/core/embed/firmware/version.h @@ -1,10 +1,10 @@ #define VERSION_MAJOR 2 -#define VERSION_MINOR 6 -#define VERSION_PATCH 5 +#define VERSION_MINOR 7 +#define VERSION_PATCH 0 #define VERSION_BUILD 0 #define FIX_VERSION_MAJOR 2 -#define FIX_VERSION_MINOR 4 +#define FIX_VERSION_MINOR 7 #define FIX_VERSION_PATCH 0 #define FIX_VERSION_BUILD 0 diff --git a/core/translations/cs.json b/core/translations/cs.json index f856937d6..c0cd5dd3b 100644 --- a/core/translations/cs.json +++ b/core/translations/cs.json @@ -17,7 +17,7 @@ }, "header": { "language": "cs-CZ", - "version": "2.6.5" + "version": "2.7.0" }, "translations": { "addr_mismatch__contact_support_at": "Prosím, obraťte se na podporu Trezoru na", diff --git a/core/translations/de.json b/core/translations/de.json index 1898d74e9..082f38c6e 100644 --- a/core/translations/de.json +++ b/core/translations/de.json @@ -17,7 +17,7 @@ }, "header": { "language": "de-DE", - "version": "2.6.5" + "version": "2.7.0" }, "translations": { "addr_mismatch__contact_support_at": "Kontaktiere den Trezor Support unter", diff --git a/core/translations/en.json b/core/translations/en.json index b8739c1be..78c6be24b 100644 --- a/core/translations/en.json +++ b/core/translations/en.json @@ -1,7 +1,7 @@ { "header": { "language": "en-US", - "version": "2.6.5" + "version": "2.7.0" }, "translations": { "addr_mismatch__contact_support_at": "Please contact Trezor support at", diff --git a/core/translations/es.json b/core/translations/es.json index c58e8be46..e0d9847cc 100644 --- a/core/translations/es.json +++ b/core/translations/es.json @@ -17,7 +17,7 @@ }, "header": { "language": "es-ES", - "version": "2.6.5" + "version": "2.7.0" }, "translations": { "addr_mismatch__contact_support_at": "Contacta con atención al cliente de Trezor en", diff --git a/core/translations/fr.json b/core/translations/fr.json index 162366626..4df4088ea 100644 --- a/core/translations/fr.json +++ b/core/translations/fr.json @@ -17,7 +17,7 @@ }, "header": { "language": "fr-FR", - "version": "2.6.5" + "version": "2.7.0" }, "translations": { "addr_mismatch__contact_support_at": "Contactez l'assistance Trezor à l'adr.", From ca5d8522508083ddc073c7596ae3d77ac8ee36c8 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Fri, 1 Mar 2024 21:21:04 +0100 Subject: [PATCH 7/9] docs(core): fix version in changelogs --- core/CHANGELOG.T2B1.md | 2 +- core/CHANGELOG.T2T1.md | 2 +- core/CHANGELOG.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/CHANGELOG.T2B1.md b/core/CHANGELOG.T2B1.md index 8d3ed7ea2..a58fbe7f7 100644 --- a/core/CHANGELOG.T2B1.md +++ b/core/CHANGELOG.T2B1.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## [2.6.5] (20th March 2024) +## [2.7.0] (20th March 2024) ### Added - Add translations capability. [#3206] diff --git a/core/CHANGELOG.T2T1.md b/core/CHANGELOG.T2T1.md index 382315de7..b6caae302 100644 --- a/core/CHANGELOG.T2T1.md +++ b/core/CHANGELOG.T2T1.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## [2.6.5] (20th March 2024) +## [2.7.0] (20th March 2024) ### Added - Add translations capability. [#3206] diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index 90ba4cf36..a730f47cf 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## [2.6.5] (20th March 2024) +## [2.7.0] (20th March 2024) ### Added - Add translations capability. [#3206] From 45e8a842a31e62a6d43d7f6ccac62a45e1198ef0 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 4 Mar 2024 12:26:10 +0100 Subject: [PATCH 8/9] fix(core): add production pubkeys for translations [no changelog] (cherry picked from commit bfacd07ed78c66b238850d551a77cae6268e4b31) --- core/embed/rust/src/translations/public_keys.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/embed/rust/src/translations/public_keys.rs b/core/embed/rust/src/translations/public_keys.rs index 130fd5a05..a7cec35ec 100644 --- a/core/embed/rust/src/translations/public_keys.rs +++ b/core/embed/rust/src/translations/public_keys.rs @@ -7,9 +7,8 @@ pub const PUBLIC_KEYS_DEVEL: [ed25519::PublicKey; 3] = [ *b"\x97\xf7\x13\x5a\x9a\x26\x90\xe7\x3b\xeb\x26\x55\x6f\x1c\xb1\x63\xbe\xa2\x53\x2a\xff\xa1\xe7\x78\x24\x30\xbe\x98\xc0\xe5\x68\x12", ]; -pub const PUBLIC_KEYS: [ed25519::PublicKey; 3] = [ - // TODO replace with production keys - *b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f", - *b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f", - *b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f", +pub const PUBLIC_KEYS: [ed25519::PublicKey; 2] = [ + *b"\x62\xce\xa8\x25\x7b\x0b\xca\x15\xb3\x3a\x76\x40\x5a\x79\xc4\x88\x1e\xb2\x0e\xe8\x23\x46\x81\x31\x81\xa5\x02\x91\xd6\xca\xec\x67", + *b"\x59\x4e\xf0\x9e\x51\x13\x93\x72\xe5\x28\xc6\xc5\xb8\x74\x2e\xe1\x80\x6f\x91\x14\xca\xea\xee\xdb\x04\xbe\x6a\x98\xe1\xce\x30\x20", + // TODO add 3rd production key ]; From 87894ae0620fb4800224b585a204a2ec5cc13d7f Mon Sep 17 00:00:00 2001 From: matejcik Date: Thu, 7 Mar 2024 12:26:58 +0100 Subject: [PATCH 9/9] chore(core): add translation signatures --- core/translations/cli.py | 6 ++---- core/translations/signatures.json | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/core/translations/cli.py b/core/translations/cli.py index 4e97f5a59..6494586c6 100644 --- a/core/translations/cli.py +++ b/core/translations/cli.py @@ -22,10 +22,8 @@ PRIVATE_KEYS_DEV = [byte * 32 for byte in (b"\xdd", b"\xde", b"\xdf")] PUBLIC_KEYS_PROD = [ bytes.fromhex(key) for key in ( - # TODO add production public keys - "aabbccdd" * 8, - "11223344" * 8, - "55667788" * 8, + "62cea8257b0bca15b33a76405a79c4881eb20ee82346813181a50291d6caec67", + "594ef09e51139372e528c6c5b8742ee1806f9114caeaeedb04be6a98e1ce3020", ) ] diff --git a/core/translations/signatures.json b/core/translations/signatures.json index 6a06ab080..137a4252e 100644 --- a/core/translations/signatures.json +++ b/core/translations/signatures.json @@ -1,9 +1,9 @@ { "current": { - "merkle_root": "b9a0dc0b332ec7edf5260447965a2ebcc66b5315c8803eb8cd0439d1022bd188", - "signature": null, - "datetime": "2024-02-26T13:15:23.679059", - "commit": "a487c0d55b27b8d3d566b50d0225db06899ea08d" + "merkle_root": "7393c46812b1bdf8789adcfde4feea951c7036c7524d9b38f64641620504898e", + "signature": "03ca77980a972b9ff9825a67d5be437f2588f095104fefc9d0415702f065fc063f9f30ce69768bf1b3c8ae7e93220c61f1e3a6d0d1cc52b8ddae6bd1766bd4f202", + "datetime": "2024-03-07T11:26:08.409760", + "commit": "45e8a842a31e62a6d43d7f6ccac62a45e1198ef0" }, "history": [] }