Merge pull request #275 from LedgerHQ/develop

merge develop into master (B2CA-1693)
LedgerHQ · Jun 20, 2024 · d9bdb6d · d9bdb6d
2 parents 79dd741 + 207b65e
commit d9bdb6d
Show file tree

Hide file tree

Showing 39 changed files with 7 additions and 35 deletions.
diff --git a/Makefile b/Makefile
@@ -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
@@ -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
diff --git a/icons/flex_app_bitcoin_cash.png b/icons/flex_app_bitcoin_cash.png
diff --git a/icons/flex_app_bitcoin_gold.png b/icons/flex_app_bitcoin_gold.png
diff --git a/icons/flex_app_bitcoin_legacy.png b/icons/flex_app_bitcoin_legacy.png
diff --git a/icons/flex_app_bitcoin_private.png b/icons/flex_app_bitcoin_private.png
diff --git a/icons/flex_app_bitcoin_testnet.png b/icons/flex_app_bitcoin_testnet.png
diff --git a/icons/flex_app_bitcoin_testnet_legacy.png b/icons/flex_app_bitcoin_testnet_legacy.png
diff --git a/icons/flex_app_dash.png b/icons/flex_app_dash.png
diff --git a/icons/flex_app_digibyte.png b/icons/flex_app_digibyte.png
diff --git a/icons/flex_app_dogecoin.png b/icons/flex_app_dogecoin.png
diff --git a/icons/flex_app_firo.png b/icons/flex_app_firo.png
diff --git a/icons/flex_app_gamecredits.png b/icons/flex_app_gamecredits.png
diff --git a/icons/flex_app_horizen.png b/icons/flex_app_horizen.png
diff --git a/icons/flex_app_hydra.png b/icons/flex_app_hydra.png
diff --git a/icons/flex_app_hydra_testnet.png b/icons/flex_app_hydra_testnet.png
diff --git a/icons/flex_app_komodo.png b/icons/flex_app_komodo.png
diff --git a/icons/flex_app_lbry.png b/icons/flex_app_lbry.png
diff --git a/icons/flex_app_litecoin.png b/icons/flex_app_litecoin.png
diff --git a/icons/flex_app_nix.png b/icons/flex_app_nix.png
diff --git a/icons/flex_app_peercoin.png b/icons/flex_app_peercoin.png
diff --git a/icons/flex_app_pivx.png b/icons/flex_app_pivx.png
diff --git a/icons/flex_app_ravencoin.png b/icons/flex_app_ravencoin.png
diff --git a/icons/flex_app_stratis.png b/icons/flex_app_stratis.png
diff --git a/icons/flex_app_vertcoin.png b/icons/flex_app_vertcoin.png
diff --git a/icons/flex_app_viacoin.png b/icons/flex_app_viacoin.png
diff --git a/icons/flex_app_xrhodium.png b/icons/flex_app_xrhodium.png
diff --git a/icons/flex_app_zclassic.png b/icons/flex_app_zclassic.png
diff --git a/icons/nanos_app_stealth.gif b/icons/nanos_app_stealth.gif
diff --git a/icons/nanos_app_xsn.gif b/icons/nanos_app_xsn.gif
diff --git a/icons/nanox_app_stealth.gif b/icons/nanox_app_stealth.gif
diff --git a/icons/nanox_app_xsn.gif b/icons/nanox_app_xsn.gif
diff --git a/icons/stax_app_stealth.gif b/icons/stax_app_stealth.gif
diff --git a/icons/stax_app_xsn.gif b/icons/stax_app_xsn.gif
diff --git a/icons/stealth.png b/icons/stealth.png
diff --git a/icons/xsn.png b/icons/xsn.png
diff --git 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
diff --git 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)