Merge pull request #458 from LedgerHQ/develop

App release 1.10.3
LedgerHQ · Jul 31, 2023 · 2264f67 · 2264f67
2 parents 1c024e5 + 5de8726
commit 2264f67
Show file tree

Hide file tree

Showing 406 changed files with 2,366 additions and 505 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -15,7 +15,7 @@ Describe your issue in as much detail as possible here.
 
 * OS and version
 * branch that causes this issue
-* Device (Nano S, Nano X, Ledger Blue)
+* Device (Nano S, Nano S Plus, Nano X, Ledger Blue)
 
 ## Steps to reproduce
 

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -15,4 +15,4 @@ Describe your issue in as much detail as possible here.
 
 * OS and version
 * branch that causes this issue
-* Device (Nano S, Nano X, Ledger Blue)
+* Device (Nano S, Nano S Plus, Nano X, Ledger Blue)
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -128,6 +128,7 @@ jobs:
   jobs-e2e-speculos-tests:
     name: Speculos tests
     strategy:
+      fail-fast: false
       matrix:
         model: ["nanosp", "nanos", "nanox"]
 
@@ -153,7 +154,7 @@ jobs:
         run: |
           cd tests/speculos
           sudo apt-get update && sudo apt-get install -y qemu-user-static
-          pip install --extra-index-url https://test.pypi.org/simple/ -r requirements.txt
+          pip install -r requirements.txt
 
       - name: Run speculos tests
         run: |
@@ -171,7 +172,6 @@ jobs:
     with:
       upload_app_binaries_artifact: "ragger_elfs"
       flags: "DEBUG=1 CAL_CI_KEY=1 DOMAIN_NAME_TEST_KEY=1"
-      run_for_devices: '["nanos", "nanox", "nanosp"]'
 
   jobs-ragger-tests:
     name: Run Ragger tests
@@ -180,4 +180,3 @@ jobs:
     with:
       download_app_binaries_artifact: "ragger_elfs"
       test_dir: tests/ragger
-      run_for_devices: '["nanos", "nanox", "nanosp"]'
diff --git a/.github/workflows/swap-ci-workflow.yml b/.github/workflows/swap-ci-workflow.yml
@@ -0,0 +1,16 @@
+name: Swap functional tests
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+    - master
+    - develop
+  pull_request:
+
+jobs:
+  job_functional_tests:
+    uses: LedgerHQ/app-exchange/.github/workflows/reusable_swap_functional_tests.yml@develop
+    with:
+      branch_for_ethereum: ${{ github.ref }}
+      test_filter: '"ETH or eth or Ethereum or ethereum"'
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ bin/
 debug/
 dep/
 obj/
+build/
 
 # Python
 *.pyc

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,33 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.10.3](https://github.com/ledgerhq/app-ethereum/compare/1.10.2...1.10.3) - 2023-07-27
+
+### Added
+
+- (network) LUKSO mainnet & testnet
+- (network) Chiado
+- (network) PulseChain
+- (network) Neon EVM mainnet & devnet
+- (network) Venidium
+- (network) Telos EVM mainnet
+- (network) OKBChain mainnet
+- (network) Polygon zkEVM
+- (network) Base
+- (network) Sepolia
+- ENS on chains that share the Ethereum derivation path
+- Ledger Stax support
+
+### Changed
+
+- (network) xDai renamed to Gnosis
+
+### Fixed
+
+- Missing context cleanup between plugin calls
+- Miscellaneous swap issues
+- Improper EIP-712 array handling
+
 ## [1.10.2](https://github.com/ledgerhq/app-ethereum/compare/1.10.1...1.10.2) - 2023-04-24
 
 ### Added

diff --git a/Makefile b/Makefile
@@ -34,7 +34,7 @@ APP_LOAD_PARAMS += --path "1517992542'/1101353413'"
 
 APPVERSION_M=1
 APPVERSION_N=10
-APPVERSION_P=2
+APPVERSION_P=3
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 APP_LOAD_FLAGS= --appFlags 0xa40 --dep Ethereum:$(APPVERSION)
 
@@ -54,6 +54,7 @@ include ./makefile_conf/chain/$(CHAIN).mk
 else
 $(error Unsupported CHAIN - use $(SUPPORTED_CHAINS))
 endif
+CFLAGS += -DAPPNAME=\"$(APPNAME)\"
 
 #########
 # Other #
@@ -65,6 +66,12 @@ DEFINES += $(DEFINES_LIB)
 #prepare hsm generation
 ifeq ($(TARGET_NAME),TARGET_NANOS)
 ICONNAME=icons/nanos_app_$(CHAIN).gif
+else ifeq ($(TARGET_NAME),TARGET_STAX)
+ICONNAME=icons/stax_app_$(CHAIN).gif
+DEFINES += ICONGLYPH=C_stax_$(CHAIN)_64px
+DEFINES += ICONBITMAP=C_stax_$(CHAIN)_64px_bitmap
+DEFINES += ICONGLYPH_SMALL=C_stax_$(CHAIN)
+GLYPH_FILES += $(ICONNAME)
 else
 ICONNAME=icons/nanox_app_$(CHAIN).gif
 endif
@@ -79,9 +86,10 @@ all: default
 ############
 
 DEFINES   += OS_IO_SEPROXYHAL
-DEFINES   += HAVE_BAGL HAVE_SPRINTF HAVE_SNPRINTF_FORMAT_U
+DEFINES   += HAVE_SPRINTF HAVE_SNPRINTF_FORMAT_U
 DEFINES   += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=4 IO_HID_EP_LENGTH=64 HAVE_USB_APDU
 DEFINES   += LEDGER_MAJOR_VERSION=$(APPVERSION_M) LEDGER_MINOR_VERSION=$(APPVERSION_N) LEDGER_PATCH_VERSION=$(APPVERSION_P)
+DEFINES   += BUILD_YEAR=\"$(shell date +%Y)\"
 
 # U2F
 DEFINES   += HAVE_U2F HAVE_IO_U2F
@@ -90,30 +98,41 @@ DEFINES   += USB_SEGMENT_SIZE=64
 DEFINES   += BLE_SEGMENT_SIZE=32 #max MTU, min 20
 DEFINES   += UNUSED\(x\)=\(void\)x
 DEFINES   += APPVERSION=\"$(APPVERSION)\"
-DEFINES   += HAVE_UX_FLOW
 
 #WEBUSB_URL     = www.ledgerwallet.com
 #DEFINES       += HAVE_WEBUSB WEBUSB_URL_SIZE_B=$(shell echo -n $(WEBUSB_URL) | wc -c) WEBUSB_URL=$(shell echo -n $(WEBUSB_URL) | sed -e "s/./\\\'\0\\\',/g")
 
 DEFINES   += HAVE_WEBUSB WEBUSB_URL_SIZE_B=0 WEBUSB_URL=""
 
-ifeq ($(TARGET_NAME),TARGET_NANOX)
+ifneq (,$(filter $(TARGET_NAME),TARGET_NANOX TARGET_STAX))
 DEFINES   += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000
 DEFINES   += HAVE_BLE_APDU # basic ledger apdu transport over BLE
+SDK_SOURCE_PATH  += lib_blewbxx lib_blewbxx_impl
 endif
 
 ifeq ($(TARGET_NAME),TARGET_NANOS)
-DEFINES   += IO_SEPROXYHAL_BUFFER_SIZE_B=72
-DEFINES   += HAVE_WALLET_ID_SDK
+DEFINES   += IO_SEPROXYHAL_BUFFER_SIZE_B=128
 else
 DEFINES   += IO_SEPROXYHAL_BUFFER_SIZE_B=300
+endif
+
+ifeq  ($(TARGET_NAME),TARGET_STAX)
+DEFINES   += NBGL_QRCODE
+else
+DEFINES   += HAVE_BAGL
+DEFINES   += HAVE_UX_FLOW
+ifeq ($(TARGET_NAME),TARGET_NANOS)
+DEFINES   += HAVE_WALLET_ID_SDK
+DEFINES   += BAGL_WIDTH=128 BAGL_HEIGHT=32
+else
 DEFINES   += HAVE_GLO096
-DEFINES   += HAVE_BAGL BAGL_WIDTH=128 BAGL_HEIGHT=64
+DEFINES   += BAGL_WIDTH=128 BAGL_HEIGHT=64
 DEFINES   += HAVE_BAGL_ELLIPSIS # long label truncation feature
 DEFINES   += HAVE_BAGL_FONT_OPEN_SANS_REGULAR_11PX
 DEFINES   += HAVE_BAGL_FONT_OPEN_SANS_EXTRABOLD_11PX
 DEFINES   += HAVE_BAGL_FONT_OPEN_SANS_LIGHT_16PX
 endif
+endif
 
 # Enables direct data signing without having to specify it in the settings. Useful when testing with speculos.
 ALLOW_DATA:=0
@@ -167,7 +186,6 @@ endif
 endif
 
 # Enabling debug PRINTF
-DEBUG:=0
 ifneq ($(DEBUG),0)
 DEFINES += HAVE_STACK_OVERFLOW_CHECK
 ifeq ($(TARGET_NAME),TARGET_NANOS)
@@ -204,13 +222,11 @@ endif
 
 CC       := $(CLANGPATH)clang
 
-#CFLAGS   += -O0
-CFLAGS   += -Oz -Wno-format-invalid-specifier -Wno-format-extra-args
+CFLAGS   += -Wno-format-invalid-specifier -Wno-format-extra-args
 
 AS     := $(GCCPATH)arm-none-eabi-gcc
 
 LD       := $(GCCPATH)arm-none-eabi-gcc
-LDFLAGS  += -O3 -Os
 LDLIBS   += -lm -lgcc -lc
 
 # import rules to compile glyphs(/pone)
@@ -219,11 +235,12 @@ include $(BOLOS_SDK)/Makefile.glyphs
 ### variables processed by the common makefile.rules of the SDK to grab source files and include dirs
 APP_SOURCE_PATH  += src_common src src_features src_plugins
 SDK_SOURCE_PATH  += lib_stusb lib_stusb_impl lib_u2f
+ifeq  ($(TARGET_NAME),TARGET_STAX)
+APP_SOURCE_PATH  += src_nbgl
+else
 SDK_SOURCE_PATH  += lib_ux
-ifeq ($(TARGET_NAME),TARGET_NANOX)
-SDK_SOURCE_PATH  += lib_blewbxx lib_blewbxx_impl
-endif
 APP_SOURCE_PATH  += src_bagl
+endif
 
 ### initialize plugin SDK submodule if needed, rebuild it, and warn if a difference is noticed
 ifeq ($(CHAIN),ethereum)

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
   <h1 align="center">app-ethereum</h1>
 
   <p align="center">
-    Ethereum wallet application for Ledger Blue, Nano S and Nano X
+    Ethereum wallet application for Ledger Blue, Nano S, Nano S Plus and Nano X
     <br />
     <a href="https://github.com/LedgerHQ/app-ethereum/tree/master/doc"><strong>« Explore the docs »</strong></a>
     <br />
@@ -42,7 +42,7 @@
 
 ## About the project
 
-Ethereum wallet application framework for Nano S and Nano X.  
+Ethereum wallet application framework for Nano S, Nano S Plus and Nano X.  
 Ledger Blue is not maintained anymore, but the app can still be compiled for this target using the branch [`blue-final-release`](https://github.com/LedgerHQ/app-ethereum/tree/blue-final-release).
 
 ## Documentation

diff --git a/ethereum-plugin-sdk b/ethereum-plugin-sdk
diff --git a/glyphs/badge_transaction.gif b/glyphs/badge_transaction.gif
diff --git a/glyphs/blue_badge_akroma.gif b/glyphs/blue_badge_akroma.gif
diff --git a/glyphs/blue_badge_atheios.gif b/glyphs/blue_badge_atheios.gif
diff --git a/glyphs/blue_badge_callisto.gif b/glyphs/blue_badge_callisto.gif
diff --git a/glyphs/blue_badge_dexon.gif b/glyphs/blue_badge_dexon.gif
diff --git a/glyphs/blue_badge_ellaism.gif b/glyphs/blue_badge_ellaism.gif
diff --git a/glyphs/blue_badge_eosclassic.gif b/glyphs/blue_badge_eosclassic.gif
diff --git a/glyphs/blue_badge_ether1.gif b/glyphs/blue_badge_ether1.gif
diff --git a/glyphs/blue_badge_ethereum.gif b/glyphs/blue_badge_ethereum.gif
diff --git a/glyphs/blue_badge_ethereum_classic.gif b/glyphs/blue_badge_ethereum_classic.gif
diff --git a/glyphs/blue_badge_ethergem.gif b/glyphs/blue_badge_ethergem.gif
diff --git a/glyphs/blue_badge_ethersocial.gif b/glyphs/blue_badge_ethersocial.gif
diff --git a/glyphs/blue_badge_expanse.gif b/glyphs/blue_badge_expanse.gif
diff --git a/glyphs/blue_badge_gochain.gif b/glyphs/blue_badge_gochain.gif
diff --git a/glyphs/blue_badge_hpb.gif b/glyphs/blue_badge_hpb.gif
diff --git a/glyphs/blue_badge_mix.gif b/glyphs/blue_badge_mix.gif
diff --git a/glyphs/blue_badge_musicoin.gif b/glyphs/blue_badge_musicoin.gif
diff --git a/glyphs/blue_badge_pirl.gif b/glyphs/blue_badge_pirl.gif
diff --git a/glyphs/blue_badge_poa.gif b/glyphs/blue_badge_poa.gif
diff --git a/glyphs/blue_badge_reosc.gif b/glyphs/blue_badge_reosc.gif
diff --git a/glyphs/blue_badge_ropsten.gif b/glyphs/blue_badge_ropsten.gif
diff --git a/glyphs/blue_badge_rsk.gif b/glyphs/blue_badge_rsk.gif
diff --git a/glyphs/blue_badge_rsk_testnet.gif b/glyphs/blue_badge_rsk_testnet.gif
diff --git a/glyphs/blue_badge_thundercore.gif b/glyphs/blue_badge_thundercore.gif
diff --git a/glyphs/blue_badge_tomochain.gif b/glyphs/blue_badge_tomochain.gif
diff --git a/glyphs/blue_badge_ubiq.gif b/glyphs/blue_badge_ubiq.gif
diff --git a/glyphs/blue_badge_wanchain.gif b/glyphs/blue_badge_wanchain.gif
diff --git a/glyphs/blue_badge_webchain.gif b/glyphs/blue_badge_webchain.gif
diff --git a/glyphs/icon_back.gif b/glyphs/icon_back.gif
diff --git a/glyphs/icon_back_x.gif b/glyphs/icon_back_x.gif
diff --git a/glyphs/icon_certificate.gif b/glyphs/icon_certificate.gif
diff --git a/glyphs/icon_crossmark.gif b/glyphs/icon_crossmark.gif
diff --git a/glyphs/icon_dashboard.gif b/glyphs/icon_dashboard.gif
diff --git a/glyphs/icon_dashboard_x.gif b/glyphs/icon_dashboard_x.gif
diff --git a/glyphs/icon_down.gif b/glyphs/icon_down.gif
diff --git a/glyphs/icon_eye.gif b/glyphs/icon_eye.gif
diff --git a/glyphs/icon_left.gif b/glyphs/icon_left.gif
diff --git a/glyphs/icon_right.gif b/glyphs/icon_right.gif
diff --git a/glyphs/icon_toggle_reset.gif b/glyphs/icon_toggle_reset.gif
diff --git a/glyphs/icon_toggle_set.gif b/glyphs/icon_toggle_set.gif
diff --git a/glyphs/icon_up.gif b/glyphs/icon_up.gif
diff --git a/glyphs/icon_validate_14.gif b/glyphs/icon_validate_14.gif
diff --git a/glyphs/icon_warning.gif b/glyphs/icon_warning.gif
diff --git a/glyphs/nanos_badge_akroma.gif b/glyphs/nanos_badge_akroma.gif
diff --git a/glyphs/nanos_badge_artis_sigma1.gif b/glyphs/nanos_badge_artis_sigma1.gif
diff --git a/glyphs/nanos_badge_artis_tau1.gif b/glyphs/nanos_badge_artis_tau1.gif
diff --git a/glyphs/nanos_badge_atheios.gif b/glyphs/nanos_badge_atheios.gif
diff --git a/glyphs/nanos_badge_callisto.gif b/glyphs/nanos_badge_callisto.gif
diff --git a/glyphs/nanos_badge_dexon.gif b/glyphs/nanos_badge_dexon.gif
diff --git a/glyphs/nanos_badge_ellaism.gif b/glyphs/nanos_badge_ellaism.gif
diff --git a/glyphs/nanos_badge_ether1.gif b/glyphs/nanos_badge_ether1.gif
diff --git a/glyphs/nanos_badge_ethereum.gif b/glyphs/nanos_badge_ethereum.gif
diff --git a/glyphs/nanos_badge_ethereum_classic.gif b/glyphs/nanos_badge_ethereum_classic.gif
diff --git a/glyphs/nanos_badge_ethergem.gif b/glyphs/nanos_badge_ethergem.gif
diff --git a/glyphs/nanos_badge_ethersocial.gif b/glyphs/nanos_badge_ethersocial.gif
diff --git a/glyphs/nanos_badge_expanse.gif b/glyphs/nanos_badge_expanse.gif
diff --git a/glyphs/nanos_badge_gochain.gif b/glyphs/nanos_badge_gochain.gif
diff --git a/glyphs/nanos_badge_hpb.gif b/glyphs/nanos_badge_hpb.gif
diff --git a/glyphs/nanos_badge_kusd.gif b/glyphs/nanos_badge_kusd.gif
diff --git a/glyphs/nanos_badge_mix.gif b/glyphs/nanos_badge_mix.gif
diff --git a/glyphs/nanos_badge_musicoin.gif b/glyphs/nanos_badge_musicoin.gif
diff --git a/glyphs/nanos_badge_pirl.gif b/glyphs/nanos_badge_pirl.gif
diff --git a/glyphs/nanos_badge_poa.gif b/glyphs/nanos_badge_poa.gif
diff --git a/glyphs/nanos_badge_reosc.gif b/glyphs/nanos_badge_reosc.gif
diff --git a/glyphs/nanos_badge_ropsten.gif b/glyphs/nanos_badge_ropsten.gif
diff --git a/glyphs/nanos_badge_rsk.gif b/glyphs/nanos_badge_rsk.gif
diff --git a/glyphs/nanos_badge_rsk_testnet.gif b/glyphs/nanos_badge_rsk_testnet.gif
diff --git a/glyphs/nanos_badge_thundercore.gif b/glyphs/nanos_badge_thundercore.gif
diff --git a/glyphs/nanos_badge_tomochain.gif b/glyphs/nanos_badge_tomochain.gif
diff --git a/glyphs/nanos_badge_ubiq.gif b/glyphs/nanos_badge_ubiq.gif
diff --git a/glyphs/nanos_badge_wanchain.gif b/glyphs/nanos_badge_wanchain.gif
diff --git a/glyphs/nanos_badge_webchain.gif b/glyphs/nanos_badge_webchain.gif
diff --git a/glyphs/stax_akroma_64px.gif b/glyphs/stax_akroma_64px.gif
diff --git a/glyphs/stax_apothemnetwork_64px.gif b/glyphs/stax_apothemnetwork_64px.gif
diff --git a/glyphs/stax_artis_sigma1_64px.gif b/glyphs/stax_artis_sigma1_64px.gif
diff --git a/glyphs/stax_artis_tau1_64px.gif b/glyphs/stax_artis_tau1_64px.gif
diff --git a/glyphs/stax_astar_64px.gif b/glyphs/stax_astar_64px.gif
diff --git a/glyphs/stax_atheios_64px.gif b/glyphs/stax_atheios_64px.gif
diff --git a/glyphs/stax_bsc_64px.gif b/glyphs/stax_bsc_64px.gif
diff --git a/glyphs/stax_bttc_64px.gif b/glyphs/stax_bttc_64px.gif
diff --git a/glyphs/stax_callisto_64px.gif b/glyphs/stax_callisto_64px.gif
diff --git a/glyphs/stax_conflux_espace_64px.gif b/glyphs/stax_conflux_espace_64px.gif
diff --git a/glyphs/stax_cube_64px.gif b/glyphs/stax_cube_64px.gif
diff --git a/glyphs/stax_dexon_64px.gif b/glyphs/stax_dexon_64px.gif
diff --git a/glyphs/stax_ellaism_64px.gif b/glyphs/stax_ellaism_64px.gif
diff --git a/glyphs/stax_energywebchain_64px.gif b/glyphs/stax_energywebchain_64px.gif
diff --git a/glyphs/stax_ether1_64px.gif b/glyphs/stax_ether1_64px.gif
diff --git a/glyphs/stax_ethereum_64px.gif b/glyphs/stax_ethereum_64px.gif
diff --git a/glyphs/stax_ethereum_classic_64px.gif b/glyphs/stax_ethereum_classic_64px.gif
diff --git a/glyphs/stax_ethergem_64px.gif b/glyphs/stax_ethergem_64px.gif
diff --git a/glyphs/stax_ethersocial_64px.gif b/glyphs/stax_ethersocial_64px.gif
diff --git a/glyphs/stax_expanse_64px.gif b/glyphs/stax_expanse_64px.gif
diff --git a/glyphs/stax_flare_64px.gif b/glyphs/stax_flare_64px.gif
diff --git a/glyphs/stax_flare_coston_64px.gif b/glyphs/stax_flare_coston_64px.gif
diff --git a/glyphs/stax_gochain_64px.gif b/glyphs/stax_gochain_64px.gif
diff --git a/glyphs/stax_goerli_64px.gif b/glyphs/stax_goerli_64px.gif
diff --git a/glyphs/stax_hpb_64px.gif b/glyphs/stax_hpb_64px.gif
diff --git a/glyphs/stax_id4good_64px.gif b/glyphs/stax_id4good_64px.gif
diff --git a/glyphs/stax_kardiachain_64px.gif b/glyphs/stax_kardiachain_64px.gif
diff --git a/glyphs/stax_kusd_64px.gif b/glyphs/stax_kusd_64px.gif
diff --git a/glyphs/stax_meter_64px.gif b/glyphs/stax_meter_64px.gif
diff --git a/glyphs/stax_mix_64px.gif b/glyphs/stax_mix_64px.gif
diff --git a/glyphs/stax_moonbeam_64px.gif b/glyphs/stax_moonbeam_64px.gif
diff --git a/glyphs/stax_moonriver_64px.gif b/glyphs/stax_moonriver_64px.gif
diff --git a/glyphs/stax_multivac_64px.gif b/glyphs/stax_multivac_64px.gif
diff --git a/glyphs/stax_musicoin_64px.gif b/glyphs/stax_musicoin_64px.gif
diff --git a/glyphs/stax_oasys_64px.gif b/glyphs/stax_oasys_64px.gif
diff --git a/glyphs/stax_okc_64px.gif b/glyphs/stax_okc_64px.gif
diff --git a/glyphs/stax_pirl_64px.gif b/glyphs/stax_pirl_64px.gif
diff --git a/glyphs/stax_poa_64px.gif b/glyphs/stax_poa_64px.gif
diff --git a/glyphs/stax_polygon_64px.gif b/glyphs/stax_polygon_64px.gif
diff --git a/glyphs/stax_reosc_64px.gif b/glyphs/stax_reosc_64px.gif
diff --git a/glyphs/stax_ropsten_64px.gif b/glyphs/stax_ropsten_64px.gif
diff --git a/glyphs/stax_rsk_64px.gif b/glyphs/stax_rsk_64px.gif
diff --git a/glyphs/stax_rsk_testnet_64px.gif b/glyphs/stax_rsk_testnet_64px.gif
diff --git a/glyphs/stax_shiden_64px.gif b/glyphs/stax_shiden_64px.gif
diff --git a/glyphs/stax_shyft_64px.gif b/glyphs/stax_shyft_64px.gif
diff --git a/glyphs/stax_songbird_64px.gif b/glyphs/stax_songbird_64px.gif
diff --git a/glyphs/stax_tecracoin_64px.gif b/glyphs/stax_tecracoin_64px.gif
diff --git a/glyphs/stax_tecratestnet_64px.gif b/glyphs/stax_tecratestnet_64px.gif
diff --git a/glyphs/stax_thundercore_64px.gif b/glyphs/stax_thundercore_64px.gif
diff --git a/glyphs/stax_tobalaba_64px.gif b/glyphs/stax_tobalaba_64px.gif
diff --git a/glyphs/stax_tomochain_64px.gif b/glyphs/stax_tomochain_64px.gif
diff --git a/glyphs/stax_ubiq_64px.gif b/glyphs/stax_ubiq_64px.gif
diff --git a/glyphs/stax_volta_64px.gif b/glyphs/stax_volta_64px.gif
diff --git a/glyphs/stax_wanchain_64px.gif b/glyphs/stax_wanchain_64px.gif
diff --git a/glyphs/stax_webchain_64px.gif b/glyphs/stax_webchain_64px.gif
diff --git a/glyphs/stax_wethio_64px.gif b/glyphs/stax_wethio_64px.gif
diff --git a/glyphs/stax_xdcnetwork_64px.gif b/glyphs/stax_xdcnetwork_64px.gif
diff --git a/icons/akroma.png b/icons/akroma.png
diff --git a/icons/artis_sigma1.png b/icons/artis_sigma1.png
diff --git a/icons/artis_tau1.png b/icons/artis_tau1.png
diff --git a/icons/atheios.png b/icons/atheios.png
diff --git a/icons/blue_app_akroma.gif b/icons/blue_app_akroma.gif
diff --git a/icons/blue_app_artis_sigma1.gif b/icons/blue_app_artis_sigma1.gif
diff --git a/icons/blue_app_artis_tau1.gif b/icons/blue_app_artis_tau1.gif
diff --git a/icons/blue_app_atheios.gif b/icons/blue_app_atheios.gif
diff --git a/icons/blue_app_callisto.gif b/icons/blue_app_callisto.gif
diff --git a/icons/blue_app_dexon.gif b/icons/blue_app_dexon.gif
diff --git a/icons/blue_app_ellaism.gif b/icons/blue_app_ellaism.gif
diff --git a/icons/blue_app_ether1.gif b/icons/blue_app_ether1.gif
diff --git a/icons/blue_app_ethereum.gif b/icons/blue_app_ethereum.gif
diff --git a/icons/blue_app_ethereum_classic.gif b/icons/blue_app_ethereum_classic.gif
diff --git a/icons/blue_app_ethergem.gif b/icons/blue_app_ethergem.gif
diff --git a/icons/blue_app_ethersocial.gif b/icons/blue_app_ethersocial.gif
diff --git a/icons/blue_app_ewc.gif b/icons/blue_app_ewc.gif
diff --git a/icons/blue_app_expanse.gif b/icons/blue_app_expanse.gif
diff --git a/icons/blue_app_gochain.gif b/icons/blue_app_gochain.gif
diff --git a/icons/blue_app_goerli.gif b/icons/blue_app_goerli.gif
diff --git a/icons/blue_app_hpb.gif b/icons/blue_app_hpb.gif
diff --git a/icons/blue_app_kusd.gif b/icons/blue_app_kusd.gif
diff --git a/icons/blue_app_mix.gif b/icons/blue_app_mix.gif
diff --git a/icons/blue_app_musicoin.gif b/icons/blue_app_musicoin.gif
diff --git a/icons/blue_app_pirl.gif b/icons/blue_app_pirl.gif
diff --git a/icons/blue_app_poa.gif b/icons/blue_app_poa.gif
diff --git a/icons/blue_app_reosc.gif b/icons/blue_app_reosc.gif
diff --git a/icons/blue_app_ropsten.gif b/icons/blue_app_ropsten.gif
diff --git a/icons/blue_app_rsk.gif b/icons/blue_app_rsk.gif
diff --git a/icons/blue_app_rsk_testnet.gif b/icons/blue_app_rsk_testnet.gif
diff --git a/icons/blue_app_theta.gif b/icons/blue_app_theta.gif
diff --git a/icons/blue_app_thundercore.gif b/icons/blue_app_thundercore.gif
diff --git a/icons/blue_app_tobalaba.gif b/icons/blue_app_tobalaba.gif
diff --git a/icons/blue_app_tomochain.gif b/icons/blue_app_tomochain.gif
diff --git a/icons/blue_app_ubiq.gif b/icons/blue_app_ubiq.gif
diff --git a/icons/blue_app_volta.gif b/icons/blue_app_volta.gif
diff --git a/icons/blue_app_wanchain.gif b/icons/blue_app_wanchain.gif
diff --git a/icons/blue_app_webchain.gif b/icons/blue_app_webchain.gif
diff --git a/icons/blue_badge_thundercore.gif b/icons/blue_badge_thundercore.gif
diff --git a/icons/blue_badge_tomochain.gif b/icons/blue_badge_tomochain.gif
diff --git a/icons/callisto.png b/icons/callisto.png
diff --git a/icons/dexon.png b/icons/dexon.png
diff --git a/icons/ellaism.png b/icons/ellaism.png
diff --git a/icons/ether1.png b/icons/ether1.png
diff --git a/icons/ethereum.png b/icons/ethereum.png
diff --git a/icons/ethereum_classic.png b/icons/ethereum_classic.png
diff --git a/icons/ethergem.png b/icons/ethergem.png
diff --git a/icons/ethersocial.png b/icons/ethersocial.png
diff --git a/icons/ewc.png b/icons/ewc.png
diff --git a/icons/expanse.png b/icons/expanse.png
diff --git a/icons/flare.png b/icons/flare.png
diff --git a/icons/flare_coston.png b/icons/flare_coston.png
diff --git a/icons/gochain.png b/icons/gochain.png
diff --git a/icons/goerli.png b/icons/goerli.png
diff --git a/icons/hpb.png b/icons/hpb.png
diff --git a/icons/icon_split.gif b/icons/icon_split.gif
diff --git a/icons/kusd.png b/icons/kusd.png
diff --git a/icons/mix.png b/icons/mix.png
diff --git a/icons/musicoin.png b/icons/musicoin.png
diff --git a/icons/nanos_app_tecracoin.gif b/icons/nanos_app_tecracoin.gif
diff --git a/icons/nanos_app_tecratestnet.gif b/icons/nanos_app_tecratestnet.gif
diff --git a/icons/nanox_app_tecracoin.gif b/icons/nanox_app_tecracoin.gif
diff --git a/icons/nanox_app_tecratestnet.gif b/icons/nanox_app_tecratestnet.gif
diff --git a/icons/pirl.png b/icons/pirl.png
diff --git a/icons/poa.png b/icons/poa.png
diff --git a/icons/reosc.png b/icons/reosc.png
diff --git a/icons/ropsten.png b/icons/ropsten.png
diff --git a/icons/rsk.png b/icons/rsk.png
diff --git a/icons/rsk_testnet.png b/icons/rsk_testnet.png
diff --git a/icons/songbird.png b/icons/songbird.png
diff --git a/icons/stax_app_akroma.gif b/icons/stax_app_akroma.gif
diff --git a/icons/stax_app_apothemnetwork.gif b/icons/stax_app_apothemnetwork.gif
diff --git a/icons/stax_app_artis_sigma1.gif b/icons/stax_app_artis_sigma1.gif
diff --git a/icons/stax_app_artis_tau1.gif b/icons/stax_app_artis_tau1.gif
diff --git a/icons/stax_app_astar.gif b/icons/stax_app_astar.gif
diff --git a/icons/stax_app_atheios.gif b/icons/stax_app_atheios.gif
diff --git a/icons/stax_app_bsc.gif b/icons/stax_app_bsc.gif
diff --git a/icons/stax_app_bttc.gif b/icons/stax_app_bttc.gif
diff --git a/icons/stax_app_callisto.gif b/icons/stax_app_callisto.gif
diff --git a/icons/stax_app_conflux_espace.gif b/icons/stax_app_conflux_espace.gif
diff --git a/icons/stax_app_cube.gif b/icons/stax_app_cube.gif
diff --git a/icons/stax_app_dexon.gif b/icons/stax_app_dexon.gif
diff --git a/icons/stax_app_ellaism.gif b/icons/stax_app_ellaism.gif
diff --git a/icons/stax_app_energywebchain.gif b/icons/stax_app_energywebchain.gif
diff --git a/icons/stax_app_ether1.gif b/icons/stax_app_ether1.gif
diff --git a/icons/stax_app_ethereum.gif b/icons/stax_app_ethereum.gif
diff --git a/icons/stax_app_ethereum_classic.gif b/icons/stax_app_ethereum_classic.gif
diff --git a/icons/stax_app_ethergem.gif b/icons/stax_app_ethergem.gif
diff --git a/icons/stax_app_ethersocial.gif b/icons/stax_app_ethersocial.gif
diff --git a/icons/stax_app_expanse.gif b/icons/stax_app_expanse.gif
diff --git a/icons/stax_app_flare.gif b/icons/stax_app_flare.gif
diff --git a/icons/stax_app_flare_coston.gif b/icons/stax_app_flare_coston.gif
diff --git a/icons/stax_app_gochain.gif b/icons/stax_app_gochain.gif
diff --git a/icons/stax_app_goerli.gif b/icons/stax_app_goerli.gif
diff --git a/icons/stax_app_hpb.gif b/icons/stax_app_hpb.gif
diff --git a/icons/stax_app_id4good.gif b/icons/stax_app_id4good.gif
diff --git a/icons/stax_app_kardiachain.gif b/icons/stax_app_kardiachain.gif
diff --git a/icons/stax_app_kusd.gif b/icons/stax_app_kusd.gif
diff --git a/icons/stax_app_meter.gif b/icons/stax_app_meter.gif
diff --git a/icons/stax_app_mix.gif b/icons/stax_app_mix.gif
diff --git a/icons/stax_app_moonbeam.gif b/icons/stax_app_moonbeam.gif
diff --git a/icons/stax_app_moonriver.gif b/icons/stax_app_moonriver.gif
diff --git a/icons/stax_app_multivac.gif b/icons/stax_app_multivac.gif
diff --git a/icons/stax_app_musicoin.gif b/icons/stax_app_musicoin.gif
diff --git a/icons/stax_app_oasys.gif b/icons/stax_app_oasys.gif
diff --git a/icons/stax_app_okc.gif b/icons/stax_app_okc.gif
diff --git a/icons/stax_app_pirl.gif b/icons/stax_app_pirl.gif
diff --git a/icons/stax_app_poa.gif b/icons/stax_app_poa.gif
diff --git a/icons/stax_app_polygon.gif b/icons/stax_app_polygon.gif
diff --git a/icons/stax_app_reosc.gif b/icons/stax_app_reosc.gif
diff --git a/icons/stax_app_ropsten.gif b/icons/stax_app_ropsten.gif
diff --git a/icons/stax_app_rsk.gif b/icons/stax_app_rsk.gif
diff --git a/icons/stax_app_rsk_testnet.gif b/icons/stax_app_rsk_testnet.gif
diff --git a/icons/stax_app_shiden.gif b/icons/stax_app_shiden.gif
diff --git a/icons/stax_app_shyft.gif b/icons/stax_app_shyft.gif
diff --git a/icons/stax_app_songbird.gif b/icons/stax_app_songbird.gif
diff --git a/icons/stax_app_tecracoin.gif b/icons/stax_app_tecracoin.gif
diff --git a/icons/stax_app_tecratestnet.gif b/icons/stax_app_tecratestnet.gif
diff --git a/icons/stax_app_thundercore.gif b/icons/stax_app_thundercore.gif
diff --git a/icons/stax_app_tobalaba.gif b/icons/stax_app_tobalaba.gif
diff --git a/icons/stax_app_tomochain.gif b/icons/stax_app_tomochain.gif
diff --git a/icons/stax_app_ubiq.gif b/icons/stax_app_ubiq.gif
diff --git a/icons/stax_app_volta.gif b/icons/stax_app_volta.gif
diff --git a/icons/stax_app_wanchain.gif b/icons/stax_app_wanchain.gif
diff --git a/icons/stax_app_webchain.gif b/icons/stax_app_webchain.gif
diff --git a/icons/stax_app_wethio.gif b/icons/stax_app_wethio.gif
diff --git a/icons/stax_app_xdcnetwork.gif b/icons/stax_app_xdcnetwork.gif
diff --git a/icons/thundercore.png b/icons/thundercore.png
diff --git a/icons/tobalaba.png b/icons/tobalaba.png
diff --git a/icons/tomochain.png b/icons/tomochain.png
diff --git a/icons/ubiq.png b/icons/ubiq.png
diff --git a/icons/volta.png b/icons/volta.png
diff --git a/icons/wanchain.png b/icons/wanchain.png
diff --git a/icons/webchain.png b/icons/webchain.png
diff --git a/src/common_ui.h b/src/common_ui.h
@@ -9,7 +9,6 @@ void ui_display_public_eth2(void);
 void ui_display_privacy_public_key(void);
 void ui_display_privacy_shared_secret(void);
 void ui_display_public_key(void);
-void ui_display_sign(void);
 void ui_sign_712_v0(void);
 void ui_display_stark_public(void);
 void ui_confirm_selector(void);

diff --git a/src/eth_plugin_handler.c b/src/eth_plugin_handler.c
@@ -47,6 +47,8 @@ void eth_plugin_prepare_query_contract_UI(ethQueryContractUI_t *queryContractUI,
                                           uint32_t titleLength,
                                           char *msg,
                                           uint32_t msgLength) {
+    uint64_t chain_id;
+
     memset((uint8_t *) queryContractUI, 0, sizeof(ethQueryContractUI_t));
 
     // If no extra information was found, set the pointer to NULL
@@ -64,7 +66,8 @@ void eth_plugin_prepare_query_contract_UI(ethQueryContractUI_t *queryContractUI,
     }
 
     queryContractUI->screenIndex = screenIndex;
-    strlcpy(queryContractUI->network_ticker, get_network_ticker(), MAX_TICKER_LEN);
+    chain_id = get_tx_chain_id();
+    strlcpy(queryContractUI->network_ticker, get_displayable_ticker(&chain_id), MAX_TICKER_LEN);
     queryContractUI->title = title;
     queryContractUI->titleLength = titleLength;
     queryContractUI->msg = msg;
@@ -149,7 +152,7 @@ eth_plugin_result_t eth_plugin_perform_init(uint8_t *contractAddress,
     }
 
     // Do not handle a plugin if running in swap mode
-    if (called_from_swap && (contractAddress != NULL)) {
+    if (G_called_from_swap && (contractAddress != NULL)) {
         PRINTF("eth_plug_init aborted in swap mode\n");
         return 0;
     }

diff --git a/src/eth_plugin_internal.h b/src/eth_plugin_internal.h
@@ -7,7 +7,6 @@
 
 #define SELECTOR_SIZE    4
 #define PARAMETER_LENGTH 32
-#define RUN_APPLICATION  1
 
 void copy_address(uint8_t* dst, const uint8_t* parameter, uint8_t dst_size);
 

diff --git a/src/handle_swap_sign_transaction.c b/src/handle_swap_sign_transaction.c
@@ -1,8 +1,15 @@
 #include "os_io_seproxyhal.h"
+#include "os.h"
 #include "ux.h"
 #include "handle_swap_sign_transaction.h"
 #include "shared_context.h"
 #include "utils.h"
+#ifdef HAVE_NBGL
+#include "nbgl_use_case.h"
+#endif  // HAVE_NBGL
+
+// Save the BSS address where we will write the return value when finished
+static uint8_t* G_swap_sign_return_value_address;
 
 bool copy_transaction_parameters(create_transaction_parameters_t* sign_transaction_params,
                                  chain_config_t* config) {
@@ -45,14 +52,30 @@ bool copy_transaction_parameters(create_transaction_parameters_t* sign_transacti
                    stack_data.maxFee,
                    sizeof(stack_data.maxFee));
 
+    // Full reset the global variables
+    os_explicit_zero_BSS_segment();
+    // Keep the address at which we'll reply the signing status
+    G_swap_sign_return_value_address = &sign_transaction_params->result;
+    // Commit the values read from exchange to the clean global space
+
     memcpy(&strings.common, &stack_data, sizeof(stack_data));
     return true;
 }
 
+void __attribute__((noreturn)) finalize_exchange_sign_transaction(bool is_success) {
+    *G_swap_sign_return_value_address = is_success;
+    os_lib_end();
+}
+
 void handle_swap_sign_transaction(chain_config_t* config) {
+    UX_INIT();
+#ifdef HAVE_NBGL
+    nbgl_useCaseSpinner("Signing");
+#endif  // HAVE_NBGL
+
     chainConfig = config;
     reset_app_context();
-    called_from_swap = true;
+    G_called_from_swap = true;
     io_seproxyhal_init();
 
     if (N_storage.initialized != 0x01) {
@@ -65,18 +88,15 @@ void handle_swap_sign_transaction(chain_config_t* config) {
         nvm_write((void*) &N_storage, (void*) &storage, sizeof(internalStorage_t));
     }
 
-    UX_INIT();
     USB_power(0);
     USB_power(1);
     // ui_idle();
     PRINTF("USB power ON/OFF\n");
-#ifdef TARGET_NANOX
+#ifdef HAVE_BLE
     // grab the current plane mode setting
     G_io_app.plane_mode = os_setting_get(OS_SETTING_PLANEMODE, NULL, 0);
-#endif  // TARGET_NANOX
-#ifdef HAVE_BLE
     BLE_power(0, NULL);
-    BLE_power(1, "Nano X");
+    BLE_power(1, NULL);
 #endif  // HAVE_BLE
     app_main();
 }
diff --git a/src/handle_swap_sign_transaction.h b/src/handle_swap_sign_transaction.h
@@ -1,5 +1,4 @@
-#ifndef _HANDLE_SWAP_SIGN_TRANSACTION_H_
-#define _HANDLE_SWAP_SIGN_TRANSACTION_H_
+#pragma once
 
 #include "swap_lib_calls.h"
 #include "chainConfig.h"
@@ -9,4 +8,4 @@ bool copy_transaction_parameters(create_transaction_parameters_t* sign_transacti
 
 void handle_swap_sign_transaction(chain_config_t* config);
 
-#endif  // _HANDLE_SWAP_SIGN_TRANSACTION_H_
+void __attribute__((noreturn)) finalize_exchange_sign_transaction(bool is_success);
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ bin/ @@
     debug/
     dep/
     obj/
+    build/
     # Python
     *.pyc
@@ Expand Down @@