Skip to content

Commit

Permalink
Add contact email id in touch, upgrade touch ledger SDK and bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
ajinkyaraj-23 committed Sep 27, 2024
1 parent 27aacf9 commit 613d773
Show file tree
Hide file tree
Showing 81 changed files with 27 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ PATH_APP_LOAD_PARAMS = "44'/1729'"

APPVERSION_M=2
APPVERSION_N=5
APPVERSION_P=0
APPVERSION_P=1
APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)

# COMMIT
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,11 @@ Following is a sample of measurements obtained with this app (Tezos Baking app v

| Device | Derivation Type | Avg time/signature(milliseconds) |
|--------|-------------------|----------------------------------|
| Flex | SECP256K1_tz2 | 214 |
| Flex | SECP256R1_tz3 | 215 |
| Flex | ED25519_tz1 | 456 |
| Flex | BIP32_ED25519_tz1 | 783 |
| | | |
| Nanos+ | SECP256K1_tz2 | 229 |
| Nanos+ | SECP256R1_tz3 | 226 |
| Nanos+ | ED25519_tz1 | 465 |
Expand Down
14 changes: 10 additions & 4 deletions src/ui_nbgl.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,12 @@ typedef enum {
VERSION_IDX,
DEVELOPER_IDX,
COPYRIGHT_IDX,
CONTACT_IDX,
INFO_NB
} tz_infoIndex_t;

static const char* const infoTypes[INFO_NB] =
{"Chain", "Public Key Hash", "High Watermark", "Version", "Developer", "Copyright"};
{"Chain", "Public Key Hash", "High Watermark", "Version", "Developer", "Copyright", "Contact"};

#define MAX_LENGTH 200
static const char* infoContents[INFO_NB];
Expand Down Expand Up @@ -92,11 +93,16 @@ static void initInfo(void) {
TZ_ASSERT(copy_string(infoContentsBridge[VERSION_IDX], MAX_LENGTH, APPVERSION) >= 0,
EXC_WRONG_LENGTH);

TZ_ASSERT(copy_string(infoContentsBridge[DEVELOPER_IDX], MAX_LENGTH, "Ledger") >= 0,
EXC_WRONG_LENGTH);
TZ_ASSERT(
copy_string(infoContentsBridge[DEVELOPER_IDX], MAX_LENGTH, "Trilitech Kanvas Ltd. et al") >=
0,
EXC_WRONG_LENGTH);

TZ_ASSERT(copy_string(infoContentsBridge[COPYRIGHT_IDX], MAX_LENGTH, "(c) 2023 Ledger") >= 0,
TZ_ASSERT(copy_string(infoContentsBridge[COPYRIGHT_IDX], MAX_LENGTH, "(c) 2024 Trilitech") >= 0,
EXC_WRONG_LENGTH);
TZ_ASSERT(
copy_string(infoContentsBridge[CONTACT_IDX], MAX_LENGTH, "[email protected]") >= 0,
EXC_WRONG_LENGTH);

end:
TZ_EXC_PRINT(exc);
Expand Down
6 changes: 3 additions & 3 deletions src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
#define CLASS 1

#ifndef MAJOR_VERSION
#define MAJOR_VERSION 0
#define MAJOR_VERSION 2
#endif

#ifndef MINOR_VERSION
#define MINOR_VERSION 0
#define MINOR_VERSION 5
#endif

#ifndef PATCH_VERSION
#define PATCH_VERSION 0
#define PATCH_VERSION 1
#endif

/**
Expand Down
Binary file modified test/snapshots/flex/description.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added test/snapshots/flex/description_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/snapshots/flex/test_reset_app_context/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/snapshots/flex/test_review_home/app_context_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/snapshots/flex/test_sign_delegation_fee/fee_1/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/snapshots/flex/test_sign_delegation_fee/fee_20000/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/snapshots/nanos/version.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/snapshots/nanosp/version.png
Binary file modified test/snapshots/nanox/version.png
Binary file modified test/snapshots/stax/description.png
Binary file added test/snapshots/stax/description_2.png
Binary file modified test/snapshots/stax/test_reset_app_context/00002.png
Binary file modified test/snapshots/stax/test_sign_delegation_fee/fee_1/00002.png
Binary file modified test/snapshots/stax/test_sign_delegation_fee/fee_20000/00002.png
8 changes: 7 additions & 1 deletion test/test_instructions.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,12 @@ def test_review_home(account: Optional[Account],
tezos_navigator.settings.next()
backend.wait_for_screen_change()
tezos_navigator.assert_screen(TouchFixedScreen.SETTINGS_DESCRIPTION)
tezos_navigator.settings.next()
backend.wait_for_screen_change()
tezos_navigator.assert_screen(TouchFixedScreen.SETTINGS_DESCRIPTION_2)
tezos_navigator.settings.previous()
backend.wait_for_screen_change()
tezos_navigator.assert_screen(TouchFixedScreen.SETTINGS_DESCRIPTION)
tezos_navigator.settings.previous()
backend.wait_for_screen_change()
if tezos_navigator.firmware == Firmware.STAX:
Expand Down Expand Up @@ -428,7 +434,7 @@ def test_automatic_low_cost_screensaver_exited_by_display(
def test_version(client: TezosClient) -> None:
"""Test the VERSION instruction."""

expected_version = Version(Version.AppKind.BAKING, 2, 5, 0)
expected_version = Version(Version.AppKind.BAKING, 2, 5, 1)

version = client.version()

Expand Down
1 change: 1 addition & 0 deletions test/utils/navigator.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class TouchFixedScreen(FixedScreen):
SETTINGS_HMW_DISABLED = "hwm_status_disabled"
SETTINGS_HMW_ENABLED = "hwm_status_enabled"
SETTINGS_DESCRIPTION = "description"
SETTINGS_DESCRIPTION_2 = "description_2"


class UseCaseReview(OriginalUseCaseReview):
Expand Down

0 comments on commit 613d773

Please sign in to comment.