diff --git a/Makefile b/Makefile index aa9d0c02..0e29a1de 100644 --- a/Makefile +++ b/Makefile @@ -22,12 +22,12 @@ # 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 @@ -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 @@ -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 @@ -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 diff --git a/icons/flex_app_bitcoin.png b/icons/flex_app_bitcoin.png new file mode 100644 index 00000000..64fe1796 Binary files /dev/null and b/icons/flex_app_bitcoin.png differ diff --git a/icons/flex_app_bitcoin_cash.png b/icons/flex_app_bitcoin_cash.png new file mode 100644 index 00000000..64fe1796 Binary files /dev/null and b/icons/flex_app_bitcoin_cash.png differ diff --git a/icons/flex_app_bitcoin_gold.png b/icons/flex_app_bitcoin_gold.png new file mode 100644 index 00000000..64fe1796 Binary files /dev/null and b/icons/flex_app_bitcoin_gold.png differ diff --git a/icons/flex_app_bitcoin_legacy.png b/icons/flex_app_bitcoin_legacy.png new file mode 100644 index 00000000..64fe1796 Binary files /dev/null and b/icons/flex_app_bitcoin_legacy.png differ diff --git a/icons/flex_app_bitcoin_private.png b/icons/flex_app_bitcoin_private.png new file mode 100644 index 00000000..64fe1796 Binary files /dev/null and b/icons/flex_app_bitcoin_private.png differ diff --git a/icons/flex_app_bitcoin_testnet.png b/icons/flex_app_bitcoin_testnet.png new file mode 100644 index 00000000..64fe1796 Binary files /dev/null and b/icons/flex_app_bitcoin_testnet.png differ diff --git a/icons/flex_app_bitcoin_testnet_legacy.png b/icons/flex_app_bitcoin_testnet_legacy.png new file mode 100644 index 00000000..64fe1796 Binary files /dev/null and b/icons/flex_app_bitcoin_testnet_legacy.png differ diff --git a/icons/flex_app_dash.png b/icons/flex_app_dash.png new file mode 100644 index 00000000..c2cee540 Binary files /dev/null and b/icons/flex_app_dash.png differ diff --git a/icons/flex_app_digibyte.png b/icons/flex_app_digibyte.png new file mode 100644 index 00000000..1663302f Binary files /dev/null and b/icons/flex_app_digibyte.png differ diff --git a/icons/flex_app_dogecoin.png b/icons/flex_app_dogecoin.png new file mode 100644 index 00000000..f46a55be Binary files /dev/null and b/icons/flex_app_dogecoin.png differ diff --git a/icons/flex_app_firo.png b/icons/flex_app_firo.png new file mode 100644 index 00000000..b866ecc3 Binary files /dev/null and b/icons/flex_app_firo.png differ diff --git a/icons/flex_app_gamecredits.png b/icons/flex_app_gamecredits.png new file mode 100644 index 00000000..664cfd71 Binary files /dev/null and b/icons/flex_app_gamecredits.png differ diff --git a/icons/flex_app_horizen.png b/icons/flex_app_horizen.png new file mode 100644 index 00000000..062835c4 Binary files /dev/null and b/icons/flex_app_horizen.png differ diff --git a/icons/flex_app_hydra.png b/icons/flex_app_hydra.png new file mode 100644 index 00000000..e87cbd47 Binary files /dev/null and b/icons/flex_app_hydra.png differ diff --git a/icons/flex_app_hydra_testnet.png b/icons/flex_app_hydra_testnet.png new file mode 100644 index 00000000..e87cbd47 Binary files /dev/null and b/icons/flex_app_hydra_testnet.png differ diff --git a/icons/flex_app_komodo.png b/icons/flex_app_komodo.png new file mode 100644 index 00000000..987b4877 Binary files /dev/null and b/icons/flex_app_komodo.png differ diff --git a/icons/flex_app_lbry.png b/icons/flex_app_lbry.png new file mode 100644 index 00000000..3a089e7a Binary files /dev/null and b/icons/flex_app_lbry.png differ diff --git a/icons/flex_app_litecoin.png b/icons/flex_app_litecoin.png new file mode 100644 index 00000000..bfb12124 Binary files /dev/null and b/icons/flex_app_litecoin.png differ diff --git a/icons/flex_app_nix.png b/icons/flex_app_nix.png new file mode 100644 index 00000000..f083343d Binary files /dev/null and b/icons/flex_app_nix.png differ diff --git a/icons/flex_app_peercoin.png b/icons/flex_app_peercoin.png new file mode 100644 index 00000000..9263cae0 Binary files /dev/null and b/icons/flex_app_peercoin.png differ diff --git a/icons/flex_app_pivx.png b/icons/flex_app_pivx.png new file mode 100644 index 00000000..f56b3999 Binary files /dev/null and b/icons/flex_app_pivx.png differ diff --git a/icons/flex_app_ravencoin.png b/icons/flex_app_ravencoin.png new file mode 100644 index 00000000..2da07401 Binary files /dev/null and b/icons/flex_app_ravencoin.png differ diff --git a/icons/flex_app_stratis.png b/icons/flex_app_stratis.png new file mode 100644 index 00000000..167305a1 Binary files /dev/null and b/icons/flex_app_stratis.png differ diff --git a/icons/flex_app_vertcoin.png b/icons/flex_app_vertcoin.png new file mode 100644 index 00000000..d543d54c Binary files /dev/null and b/icons/flex_app_vertcoin.png differ diff --git a/icons/flex_app_viacoin.png b/icons/flex_app_viacoin.png new file mode 100644 index 00000000..fab9a4df Binary files /dev/null and b/icons/flex_app_viacoin.png differ diff --git a/icons/flex_app_xrhodium.png b/icons/flex_app_xrhodium.png new file mode 100644 index 00000000..88e334c7 Binary files /dev/null and b/icons/flex_app_xrhodium.png differ diff --git a/icons/flex_app_zclassic.png b/icons/flex_app_zclassic.png new file mode 100644 index 00000000..eee239dc Binary files /dev/null and b/icons/flex_app_zclassic.png differ diff --git a/icons/nanos_app_stealth.gif b/icons/nanos_app_stealth.gif deleted file mode 100644 index 8c96f9f3..00000000 Binary files a/icons/nanos_app_stealth.gif and /dev/null differ diff --git a/icons/nanos_app_xsn.gif b/icons/nanos_app_xsn.gif deleted file mode 100644 index b55e0ccf..00000000 Binary files a/icons/nanos_app_xsn.gif and /dev/null differ diff --git a/icons/nanox_app_stealth.gif b/icons/nanox_app_stealth.gif deleted file mode 100644 index 3d72b11f..00000000 Binary files a/icons/nanox_app_stealth.gif and /dev/null differ diff --git a/icons/nanox_app_xsn.gif b/icons/nanox_app_xsn.gif deleted file mode 100644 index 2c885ee3..00000000 Binary files a/icons/nanox_app_xsn.gif and /dev/null differ diff --git a/icons/stax_app_stealth.gif b/icons/stax_app_stealth.gif deleted file mode 100644 index 345e1242..00000000 Binary files a/icons/stax_app_stealth.gif and /dev/null differ diff --git a/icons/stax_app_xsn.gif b/icons/stax_app_xsn.gif deleted file mode 100644 index 08e35ffd..00000000 Binary files a/icons/stax_app_xsn.gif and /dev/null differ diff --git a/icons/stealth.png b/icons/stealth.png deleted file mode 100644 index 6cac62b5..00000000 Binary files a/icons/stealth.png and /dev/null differ diff --git a/icons/xsn.png b/icons/xsn.png deleted file mode 100644 index f5c43ada..00000000 Binary files a/icons/xsn.png and /dev/null differ diff --git a/ledger_app.toml b/ledger_app.toml index c264aa9d..7329320d 100644 --- a/ledger_app.toml +++ b/ledger_app.toml @@ -1,7 +1,7 @@ [app] build_directory = "./" sdk = "C" -devices = ["nanos", "nanox", "nanos+", "stax"] +devices = ["nanos", "nanox", "nanos+", "stax", "flex"] [tests] pytest_directory = "./tests/" diff --git a/lib-app-bitcoin b/lib-app-bitcoin index 824df017..1febc015 160000 --- a/lib-app-bitcoin +++ b/lib-app-bitcoin @@ -1 +1 @@ -Subproject commit 824df01726df459b1fd527f96a8ddd4558017fea +Subproject commit 1febc0159275c8cad1d352b846a039471b45237d diff --git a/tests/test_get_pubkey.py b/tests/test_get_pubkey.py index 40c82777..6a868cc7 100644 --- a/tests/test_get_pubkey.py +++ b/tests/test_get_pubkey.py @@ -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)