Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix Flex porting #271

Merged
merged 5 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# Application version
APPVERSION_M = 2
APPVERSION_N = 4
APPVERSION_P = 1
APPVERSION_P = 2

APPDEVELOPPER="Ledger"
APPCOPYRIGHT="(c) 2024 Ledger"
Expand All @@ -35,7 +35,7 @@ VARIANT_VALUES = bitcoin_testnet_legacy bitcoin_legacy bitcoin_cash bitcoin_gold

# simplify for tests
ifndef COIN
COIN=bitcoin_legacy
COIN=bitcoin_testnet_legacy
endif

# Enabling DEBUG flag will enable PRINTF and disable optimizations
Expand Down
Binary file added icons/flex_app_bitcoin.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 icons/flex_app_bitcoin_cash.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 icons/flex_app_bitcoin_gold.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 icons/flex_app_bitcoin_legacy.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 icons/flex_app_bitcoin_private.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 icons/flex_app_bitcoin_testnet.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 icons/flex_app_bitcoin_testnet_legacy.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 icons/flex_app_dash.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 icons/flex_app_digibyte.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 icons/flex_app_dogecoin.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 icons/flex_app_firo.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 icons/flex_app_gamecredits.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 icons/flex_app_horizen.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 icons/flex_app_hydra.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 icons/flex_app_hydra_testnet.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 icons/flex_app_komodo.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 icons/flex_app_lbry.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 icons/flex_app_litecoin.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 icons/flex_app_nix.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 icons/flex_app_peercoin.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 icons/flex_app_pivx.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 icons/flex_app_ravencoin.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 icons/flex_app_stratis.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 icons/flex_app_vertcoin.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 icons/flex_app_viacoin.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 icons/flex_app_xrhodium.png
Binary file added icons/flex_app_zclassic.png
Binary file removed icons/nanos_app_stealth.gif
Diff not rendered.
Binary file removed icons/nanos_app_xsn.gif
Diff not rendered.
Binary file removed icons/nanox_app_stealth.gif
Diff not rendered.
Binary file removed icons/nanox_app_xsn.gif
Diff not rendered.
Binary file removed icons/stax_app_stealth.gif
Diff not rendered.
Binary file removed icons/stax_app_xsn.gif
Diff not rendered.
Binary file removed icons/stealth.png
Diff not rendered.
Binary file removed icons/xsn.png
Diff not rendered.
2 changes: 1 addition & 1 deletion ledger_app.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[app]
build_directory = "./"
sdk = "C"
devices = ["nanos", "nanox", "nanos+", "stax"]
devices = ["nanos", "nanox", "nanos+", "stax", "flex"]

[tests]
pytest_directory = "./tests/"
2 changes: 1 addition & 1 deletion lib-app-bitcoin
Submodule lib-app-bitcoin updated 1 files
+1 −2 Makefile
3 changes: 2 additions & 1 deletion tests/test_get_pubkey.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ def pubkey_instruction_warning_approve(model: Firmware) -> Instructions:
else:
instructions.new_request("Unusual", NavInsID.USE_CASE_CHOICE_CONFIRM,
NavInsID.USE_CASE_CHOICE_CONFIRM)
instructions.same_request("Confirm", NavInsID.USE_CASE_ADDRESS_CONFIRMATION_TAP,
instructions.same_request("Confirm", NavInsID.USE_CASE_ADDRESS_CONFIRMATION_TAP if model.name == "stax"
yogh333 marked this conversation as resolved.
Show resolved Hide resolved
else NavInsID.SWIPE_CENTER_TO_LEFT,
NavInsID.USE_CASE_ADDRESS_CONFIRMATION_CONFIRM)
instructions.same_request("Address", NavInsID.USE_CASE_REVIEW_TAP,
NavInsID.USE_CASE_STATUS_DISMISS)
Expand Down
Loading