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

merge develop into master (B2CA-1693) #275

Merged
merged 15 commits into from
Jun 20, 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
35 changes: 3 additions & 32 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@
# Application version
APPVERSION_M = 2
APPVERSION_N = 4
APPVERSION_P = 1
APPVERSION_P = 4

APPDEVELOPPER="Ledger"
APPCOPYRIGHT="(c) 2024 Ledger"

VARIANT_VALUES = bitcoin_testnet_legacy bitcoin_legacy bitcoin_cash bitcoin_gold litecoin dogecoin dash horizen komodo stratis peercoin pivx viacoin vertcoin stealth digibyte bitcoin_private firo gamecredits zclassic xsn nix lbry ravencoin hydra hydra_testnet xrhodium
VARIANT_VALUES = bitcoin_testnet_legacy bitcoin_legacy bitcoin_cash bitcoin_gold litecoin dogecoin dash horizen komodo stratis peercoin pivx viacoin vertcoin digibyte bitcoin_private firo gamecredits zclassic nix lbry ravencoin hydra hydra_testnet xrhodium

# Application source files
# There is no additional sources for bitcoin
#APP_SOURCE_PATH += src/

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

# Enabling DEBUG flag will enable PRINTF and disable optimizations
Expand Down Expand Up @@ -239,20 +239,6 @@ COIN_COINID_SHORT=\"PIVX\"
COIN_KIND=COIN_KIND_PIVX
APPNAME ="PivX"

else ifeq ($(COIN),stealth)
# Stealth
BIP44_COIN_TYPE=125
BIP44_COIN_TYPE_2=125
COIN_P2PKH_VERSION=62
COIN_P2SH_VERSION=85
COIN_FAMILY=4
COIN_COINID=\"Stealth\"
COIN_COINID_NAME="Stealth"
COIN_COINID_SHORT=\"XST\"
COIN_KIND=COIN_KIND_STEALTH
COIN_FLAGS=FLAG_PEERCOIN_UNITS\|FLAG_PEERCOIN_SUPPORT
APPNAME ="Stealth"

else ifeq ($(COIN),viacoin)
# Viacoin
BIP44_COIN_TYPE=14
Expand Down Expand Up @@ -354,21 +340,6 @@ COIN_COINID_SHORT=\"ZCL\"
COIN_KIND=COIN_KIND_ZCLASSIC
APPNAME ="ZClassic"

else ifeq ($(COIN),xsn)
# XSN mainnet
BIP44_COIN_TYPE=384
BIP44_COIN_TYPE_2=384
COIN_P2PKH_VERSION=76
COIN_P2SH_VERSION=16
COIN_FAMILY=1
COIN_COINID=\"XSN\"
COIN_COINID_NAME="XSN"
COIN_COINID_SHORT=\"XSN\"
COIN_NATIVE_SEGWIT_PREFIX=\"xc\"
COIN_KIND=COIN_KIND_XSN
COIN_FLAGS=FLAG_SEGWIT_CHANGE_SUPPORT
APPNAME ="XSN"

else ifeq ($(COIN),nix)
# NIX
BIP44_COIN_TYPE=400
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
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"
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