speculos 0.7.2.dev2__tar.gz → 0.7.2.dev18__tar.gz

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/.github/workflows/continuous-integration-workflow.yml

@@ -154,7 +154,7 @@ jobs:
       id: meta
       uses: docker/metadata-action@v4
       with:
-        images: ledgerhq/speculos
+        images: ghcr.io/ledgerhq/speculos
         tags: |
           type=raw,value=${{ github.sha }}
           type=ref,event=branch

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/CHANGELOG.md

@@ -5,7 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.7.1] - 2-24-02-26
+## [0.8.0] - 2024-04-03
+
+### Added
+
+- NBGL support for non-Stax devices
+- Add Flex support
+- Add support of API_LEVEL_18 for NanoX, NanoS+ and Flex
+
+## [0.7.1] - 2024-02-26
 
 ### Fixed
 

{speculos-0.7.2.dev2/speculos.egg-info → speculos-0.7.2.dev18}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: speculos
-Version: 0.7.2.dev2
-Summary: Ledger Blue, Stax and Nano S/S+/X application emulator
+Version: 0.7.2.dev18
+Summary: Ledger Blue, Stax, Flex and Nano S/S+/X application emulator
 Author-email: Ledger <hello@ledger.fr>
 Project-URL: Homepage, https://github.com/LedgerHQ/speculos
 Project-URL: Bug Tracker, https://github.com/LedgerHQ/speculos/issues
@@ -26,6 +26,7 @@ Requires-Dist: pillow<11.0.0,>=8.0.0
 Requires-Dist: pyelftools<1.0,>=0.27
 Requires-Dist: pyqt5<6.0.0,>=5.15.2
 Requires-Dist: requests<3.0.0,>=2.25.1
+Requires-Dist: ledgered>=0.6.2
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
@@ -37,7 +38,7 @@ Requires-Dist: pytest-cov; extra == "dev"
 
 ![screenshot btc nano s](https://raw.githubusercontent.com/LedgerHQ/speculos/master/docs/screenshot-api-nanos-btc.png)
 
-The goal of this project is to emulate Ledger Nano S/S+, Nano X, Blue and Stax apps on
+The goal of this project is to emulate Ledger Nano S/S+, Nano X, Blue, Flex and Stax apps on
 standard desktop computers, without any hardware device. More information can
 be found here in the
 [documentation website](https://ledgerhq.github.io/speculos) (or in the
@@ -99,7 +100,7 @@ PRINTF("display_value: %d\n", display_value);
 
 ### Watchdog
 
-NanoX and Stax devices use an internal watchdog enforcing usage of regular
+NanoX, Flex and Stax devices use an internal watchdog enforcing usage of regular
 calls to `io_seproxyhal_io_heartbeat();`. This watchdog is not emulated on
 Speculos.
 
@@ -121,5 +122,5 @@ Speculos is not part of Ledger bug bounty program.
 ## Are you developing a Nano App as an external developer?
 
 For a smooth and quick integration:
-- Follow the developers documentation on the [Developer Portal](https://developers.ledger.com/docs/nano-app/introduction/) and 
+- Follow the developers documentation on the [Developer Portal](https://developers.ledger.com/docs/nano-app/introduction/) and
 - [Go on Discord](https://developers.ledger.com/discord-pro/) to chat with developer support and the developer community.

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/Pipfile

@@ -15,6 +15,7 @@ pillow = ">=8.0.0,<11.0.0"
 pyelftools = ">=0.27,<1.0"
 pyqt5 = ">=5.15.2,<6.0.0"
 requests = ">=2.25.1,<3.0.0"
+ledgered = ">=0.6.2"
 
 [requires]
 python_version = "3.9"

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "1d2d56fb3692fb2ee39ed3517d4534cfb462c4beee4f8d22fb0f844c55b79b28"
+            "sha256": "e18891c836ceeb31bd4015caa411c87e9802c861ea17f110c1737a566a67eb91"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -185,6 +185,14 @@
             "markers": "python_version >= '3.5'",
             "version": "==3.6"
         },
+        "importlib-metadata": {
+            "hashes": [
+                "sha256:30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570",
+                "sha256:b78938b926ee8d5f020fc4772d487045805a55ddbad2ecf21c6d60938dc7fcd2"
+            ],
+            "markers": "python_version < '3.10'",
+            "version": "==7.1.0"
+        },
         "itsdangerous": {
             "hashes": [
                 "sha256:2c2349112351b88699d8d4b6b075022c0808887cb7ad10069318a8b0bc88db44",
@@ -210,6 +218,15 @@
             "markers": "python_version >= '3.7'",
             "version": "==4.17.3"
         },
+        "ledgered": {
+            "hashes": [
+                "sha256:0c83cd3f844b9a322a3fbb656a04e706b61d37e65e0986387435a4a66b5765bd",
+                "sha256:f57d75bdc964a2fd53ce808ea4cd8192efc9d7712b5f5f4321bde18f3d46b111"
+            ],
+            "index": "pypi",
+            "markers": "python_version >= '3.7'",
+            "version": "==0.6.3"
+        },
         "markupsafe": {
             "hashes": [
                 "sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf",
@@ -362,11 +379,11 @@
         },
         "pyelftools": {
             "hashes": [
-                "sha256:2fc92b0d534f8b081f58c7c370967379123d8e00984deb53c209364efd575b40",
-                "sha256:544c3440eddb9a0dce70b6611de0b28163d71def759d2ed57a0d00118fc5da86"
+                "sha256:c774416b10310156879443b81187d182d8d9ee499660380e645918b50bc88f99",
+                "sha256:f52de7b3c7e8c64c8abc04a79a1cf37ac5fb0b8a49809827130b858944840607"
             ],
             "index": "pypi",
-            "version": "==0.30"
+            "version": "==0.31"
         },
         "pyqt5": {
             "hashes": [
@@ -479,13 +496,21 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.16.0"
         },
+        "toml": {
+            "hashes": [
+                "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b",
+                "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
+            ],
+            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==0.10.2"
+        },
         "urllib3": {
             "hashes": [
-                "sha256:051d961ad0c62a94e50ecf1af379c3aba230c66c710493493560c0c223c49f20",
-                "sha256:ce3711610ddce217e6d113a2732fafad960a03fd0318c91faa79481e35c11224"
+                "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d",
+                "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.2.0"
+            "version": "==2.2.1"
         },
         "werkzeug": {
             "hashes": [
@@ -494,6 +519,14 @@
             ],
             "markers": "python_version >= '3.8'",
             "version": "==3.0.1"
+        },
+        "zipp": {
+            "hashes": [
+                "sha256:206f5a15f2af3dbaee80769fb7dc6f249695e940acca08dfb2a4769fe61e538b",
+                "sha256:2884ed22e7d8961de1c9a05142eb69a247f120291bc0206a00a7642f09b5b715"
+            ],
+            "markers": "python_version >= '3.8'",
+            "version": "==3.18.1"
         }
     },
     "develop": {}

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/README.md

@@ -5,7 +5,7 @@
 
 ![screenshot btc nano s](https://raw.githubusercontent.com/LedgerHQ/speculos/master/docs/screenshot-api-nanos-btc.png)
 
-The goal of this project is to emulate Ledger Nano S/S+, Nano X, Blue and Stax apps on
+The goal of this project is to emulate Ledger Nano S/S+, Nano X, Blue, Flex and Stax apps on
 standard desktop computers, without any hardware device. More information can
 be found here in the
 [documentation website](https://ledgerhq.github.io/speculos) (or in the
@@ -67,7 +67,7 @@ PRINTF("display_value: %d\n", display_value);
 
 ### Watchdog
 
-NanoX and Stax devices use an internal watchdog enforcing usage of regular
+NanoX, Flex and Stax devices use an internal watchdog enforcing usage of regular
 calls to `io_seproxyhal_io_heartbeat();`. This watchdog is not emulated on
 Speculos.
 
@@ -89,5 +89,5 @@ Speculos is not part of Ledger bug bounty program.
 ## Are you developing a Nano App as an external developer?
 
 For a smooth and quick integration:
-- Follow the developers documentation on the [Developer Portal](https://developers.ledger.com/docs/nano-app/introduction/) and 
+- Follow the developers documentation on the [Developer Portal](https://developers.ledger.com/docs/nano-app/introduction/) and
 - [Go on Discord](https://developers.ledger.com/discord-pro/) to chat with developer support and the developer community.

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/docs/user/usage.md

@@ -12,13 +12,14 @@ After having [installed the requirements and built](../installation/build.md) sp
 
 The docker image can also be used directly, as detailed in the specific [docker documentation page](docker.md).
 
-With applications built by recent SDKs, Speculos can automatically detect the targeted device. Otherwise, the Nano S is the default; the Nano X, Nano S+, Stax and Blue can be specified on the command line:
+With applications built by recent SDKs, Speculos can automatically detect the targeted device. Otherwise, the Nano S is the default; the Nano X, Nano S+, Flex, Stax and Blue can be specified on the command line:
 
 ```shell
 ./speculos.py --model nanox apps/nanox#btc#2.0.2#1c8db8da.elf
 ./speculos.py --model nanosp apps/nanosp#btc#1.0.3#17bf7619.elf
 ./speculos.py --model blue --sdk 1.5 apps/blue#btc#1.5#00000000.elf
 ./speculos.py --model stax apps/btc.elf.elf
+./speculos.py --model flex apps/btc.elf.elf
 ```
 
 The last SDK version is automatically selected. However, a specific version
@@ -93,4 +94,4 @@ Launch the Bitcoin Testnet app, which requires the Bitcoin app:
 
 ## OCR
 
-OCR is available for NanoX, Nanos S+ and Stax with built in character recognition.
+OCR is available for NanoX, Nanos S+, Flex and Stax with built in character recognition.

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/pyproject.toml

@@ -10,7 +10,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "speculos"
 authors = [{name = "Ledger", email = "hello@ledger.fr"}]
-description = "Ledger Blue, Stax and Nano S/S+/X application emulator"
+description = "Ledger Blue, Stax, Flex and Nano S/S+/X application emulator"
 classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.8",
@@ -32,6 +32,7 @@ dependencies = [
     "pyelftools>=0.27,<1.0",
     "pyqt5>=5.15.2,<6.0.0",
     "requests>=2.25.1,<3.0.0",
+    "ledgered>=0.6.2",
 ]
 dynamic = ["version"]
 

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/speculos/__version__.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.7.2.dev2'
-__version_tuple__ = version_tuple = (0, 7, 2, 'dev2')
+__version__ = version = '0.7.2.dev18'
+__version_tuple__ = version_tuple = (0, 7, 2, 'dev18')

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/speculos/main.py

@@ -16,6 +16,7 @@ import sys
 import threading
 import pkg_resources
 from elftools.elf.elffile import ELFFile
+from ledgered.binary import LedgerBinaryApp
 from mnemonic import mnemonic
 from typing import Optional, Type
 
@@ -48,28 +49,6 @@ def set_pdeath(sig):
     libc.prctl(PR_SET_PDEATHSIG, sig)
 
 
-ELF_METADATA_SECTIONS = [
-    "target",
-    "app_name",
-    "app_version",
-    "api_level"
-]
-
-
-def get_elf_ledger_metadata(app_path):
-    with open(app_path, 'rb') as fp:
-        elf = ELFFile(fp)
-        metadata = {}
-        for section_name in ELF_METADATA_SECTIONS:
-            section = elf.get_section_by_name(f"ledger.{section_name}")
-            if section:
-                metadata[section_name] = section.data().decode("utf-8").strip()
-                if section_name == "target":
-                    if metadata[section_name] == "nanos2":
-                        metadata[section_name] = "nanosp"
-    return metadata
-
-
 def get_elf_infos(app_path):
     with open(app_path, 'rb') as fp:
         elf = ELFFile(fp)
@@ -106,8 +85,9 @@ def get_elf_infos(app_path):
         svc_cx_call_symbol = symtab.get_symbol_by_name("SVC_cx_call")
         if svc_cx_call_symbol is not None:
             svc_cx_call_addr = svc_cx_call_symbol[0]['st_value'] & (~1)
-        # Check where are located fonts in .elf file (LNX/LNS+ only)
-        # (Stax fonts are loaded at a known location: STAX_FONTS_ARRAY_ADDR)
+        # Check where are located fonts in .elf file (LNX/LNS+ with BAGL only)
+        # (on apps using NBGL, fonts are loaded from a known location: STAX_FONTS_ARRAY_ADDR,
+        #  FLEX_FONTS_ARRAY_ADDR, NANOX_FONTS_ARRAY_ADDR or NANOSP_FONTS_ARRAY_ADDR)
         fonts_addr = 0
         fonts_size = 0
         bagl_fonts_symbol = symtab.get_symbol_by_name('C_bagl_fonts')
@@ -139,7 +119,7 @@ def get_cx_infos(app_path):
     return sh_offset, sh_size, sh_load, cx_ram_size, cx_ram_load
 
 
-def run_qemu(s1: socket.socket, s2: socket.socket, args: argparse.Namespace) -> int:
+def run_qemu(s1: socket.socket, s2: socket.socket, args: argparse.Namespace, use_bagl: bool) -> int:
     argv = ['qemu-arm-static']
 
     if args.debug:
@@ -170,7 +150,8 @@ def run_qemu(s1: socket.socket, s2: socket.socket, args: argparse.Namespace) ->
     else:
         logger.warn(f"Cx lib {cxlib_filepath} not found")
 
-    if args.model == "stax":
+    # for NBGL apps, fonts binary file is mandatory
+    if not use_bagl:
         fonts_filepath = f"/fonts/{args.model}-fonts-{args.apiLevel}.bin"
         fonts = pkg_resources.resource_filename(__name__, fonts_filepath)
         if os.path.exists(fonts):
@@ -185,6 +166,7 @@ def run_qemu(s1: socket.socket, s2: socket.socket, args: argparse.Namespace) ->
         load_offset, load_size, stack, stack_size, ram_addr, ram_size, \
             text_load_addr, svc_call_address, svc_cx_call_address, \
             fonts_addr, fonts_size = get_elf_infos(lib_path)
+
         # Since binaries loaded as libs could also declare extra RAM page(s), collect them all
         if (ram_addr, ram_size) != (0, 0):
             arg = f'{ram_addr:#x}:{ram_size:#x}'
@@ -317,18 +299,25 @@ def main(prog=None) -> int:
 
     # Init model and api_level if not specified from app elf metadata
     app_path = getattr(args, 'app.elf')
-    metadata = get_elf_ledger_metadata(app_path)
+    binary = LedgerBinaryApp(app_path)
     if not args.model:
-        if "target" not in metadata:
+        if binary.sections.target is None:
             logger.error("Device model not detected from elf. Then it must be specified")
             sys.exit(1)
         else:
-            args.model = metadata["target"]
+            args.model = "nanosp" if binary.sections.target == "nanos2" else binary.sections.target
             logger.warn(f"Device model detected from metadata: {args.model}")
 
+    # 'bagl' is the default value of the binary.sections.sdk_graphics. We need to
+    # manage the cases where it is NOT 'bagl' but the section does not exists yet
+    if args.model in ["stax", "flex"]:
+        use_bagl = False
+    else:
+        use_bagl = binary.sections.sdk_graphics == "bagl"
+
     if not args.apiLevel:
-        if "api_level" in metadata:
-            args.apiLevel = metadata["api_level"]
+        if binary.sections.api_level is not None:
+            args.apiLevel = binary.sections.api_level
             logger.warn(f"Api level detected from metadata: {args.apiLevel}")
 
     # Check args.apiLevel, 0 is an invalid value
@@ -338,8 +327,8 @@ def main(prog=None) -> int:
 
     # Set SPECULOS_DETECTED_APPNAME env variable for proper emulation.
     # See sys_os_registry_get_current_app_tag() for corresponding usage.
-    app_name = metadata.get("app_name")
-    app_version = metadata.get("app_version")
+    app_name = binary.sections.app_name
+    app_version = binary.sections.app_version
     if app_name and app_version:
         os.environ["SPECULOS_DETECTED_APPNAME"] = f"{app_name}:{app_version}"
 
@@ -352,8 +341,7 @@ def main(prog=None) -> int:
             lib_name = None
             lib_path = lib_arg
 
-        metadata = get_elf_ledger_metadata(lib_path)
-        elf_lib_name = metadata.get("app_name", None)
+        elf_lib_name = LedgerBinaryApp(lib_path).sections.app_name
 
         if lib_name is None:
             if elf_lib_name is None:
@@ -372,14 +360,14 @@ def main(prog=None) -> int:
 
     # Check model and api_level against all lib elf metadata
     for path in [app_path] + [x.split(":")[1] for x in args.library]:
-        metadata = get_elf_ledger_metadata(path)
+        binary = LedgerBinaryApp(path)
 
-        elf_model = metadata.get("target", args.model)
+        elf_model = ("nanosp" if binary.sections.target == "nanos2" else binary.sections.target) or args.model
         if args.model != elf_model:
             logger.error(f"Invalid model in {path} ({elf_model} vs {args.model})")
             sys.exit(1)
 
-        elf_api_level = metadata.get("api_level", "0")
+        elf_api_level = binary.sections.api_level or "0"
         # Check args.apiLevel against elf api level. If elf api level == 0 (SDK master
         # reserved value) ignore it.
         if elf_api_level != "0" and args.apiLevel != elf_api_level:
@@ -473,13 +461,14 @@ def main(prog=None) -> int:
 
     s1, s2 = socket.socketpair()
 
-    qemu_pid = run_qemu(s1, s2, args)
+    qemu_pid = run_qemu(s1, s2, args, use_bagl)
     s1.close()
 
     apdu = apdu_server.ApduServer(host="0.0.0.0", port=args.apdu_port)
     seph = seproxyhal.SeProxyHal(
         s2,
         model=args.model,
+        use_bagl=use_bagl,
         automation=automation_path,
         automation_server=automation_server,
         transport=args.usb)
@@ -507,6 +496,7 @@ def main(prog=None) -> int:
             "nanosp": 2,
             "blue": 1,
             "stax": 1,
+            "flex": 1
         }
         zoom = default_zoom.get(args.model)
 
@@ -519,7 +509,7 @@ def main(prog=None) -> int:
         apirun = ApiRunner(args.api_port)
 
     display_args = DisplayArgs(args.color, args.model, args.ontop, rendering,
-                               args.keymap, zoom, x, y)
+                               args.keymap, zoom, x, y, use_bagl)
     server_args = ServerArgs(apdu, apirun, button, finger, seph, vnc)
     screen_notifier = ScreenNotifier(display_args, server_args)
 

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/speculos/mcu/display.py

@@ -74,6 +74,7 @@ class FrameBuffer:
         "nanox": 0xdddddd,
         "nanosp": 0xdddddd,
         "stax": 0xdddddd,
+        "flex": 0xdddddd,
     }
 
     def __init__(self, model: str):
@@ -92,7 +93,7 @@ class FrameBuffer:
     def check_color(self, color: int) -> int:
         # There are only 2 colors on the Nano S and the Nano X but the one
         # passed in argument isn't always valid. Fix it here.
-        if self.model != 'stax':
+        if self.model != 'stax' and self.model != 'flex':
             if color != 0x000000:
                 color = FrameBuffer.COLORS.get(self.model, color)
         return color
@@ -141,13 +142,13 @@ class FrameBuffer:
         self.screenshot_pixels.update(self.pixels)
 
     def update_public_screenshot(self) -> None:
-        # Stax only
+        # Stax/Flex only
         # As we lazyly evaluate the published screenshot, we only flag the evaluation update as necessary
         self.recreate_public_screenshot = True
 
     @property
     def public_screenshot_value(self) -> bytes:
-        # Stax only
+        # Stax/Flex only
         # Lazy calculation of the published screenshot, as it is a costly operation
         # and not necessary if no one tries to read the value
         if self.recreate_public_screenshot:
@@ -157,9 +158,9 @@ class FrameBuffer:
         return self._public_screenshot_value
 
     def get_public_screenshot(self) -> bytes:
-        if self.model == "stax":
-            # On Stax, we only make the screenshot public on the RESTFUL api when it is consistent with events
-            # On top of this, take_screenshot is time consuming on stax, so we'll do as few as possible
+        if self.model == "stax" or self.model == "flex":
+            # On Stax/Flex, we only make the screenshot public on the RESTFUL api when it is consistent with events
+            # On top of this, take_screenshot is time consuming on stax/flex, so we'll do as few as possible
             # We return the value calculated last time update_public_screenshot was called
             return self.public_screenshot_value
         # On nano we have no knowledge of screen refreshes so we can't be scarce on publishes
@@ -243,6 +244,10 @@ class Display(ABC):
     def rendering(self):
         return self._display_args.rendering
 
+    @property
+    def use_bagl(self) -> bool:
+        return self._display_args.use_bagl
+
     @property
     @abstractmethod
     def gl(self) -> GraphicLibrary:

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/speculos/mcu/headless.py

@@ -16,7 +16,7 @@ class Headless(Display):
 
         self.m = HeadlessPaintWidget(self.model, server.vnc)
         self._gl: GraphicLibrary
-        if display.model != "stax":
+        if display.use_bagl:
             self._gl = bagl.Bagl(self.m, MODELS[self.model].screen_size, self.model)
         else:
             self._gl = nbgl.NBGL(self.m, MODELS[self.model].screen_size, self.model)

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/speculos/mcu/nbgl.py

@@ -54,7 +54,7 @@ class NBGL(GraphicLibrary):
         self.logger = logging.getLogger("NBGL")
 
     def __assert_area(self, area) -> None:
-        if area.y0 % 4 or area.height % 4:
+        if self.model == "stax" and (area.y0 % 4 or area.height % 4):
             raise AssertionError("X(%d) or height(%d) not 4 aligned " % (area.y0, area.height))
         if area.x0 > self.SCREEN_WIDTH or (area.x0+area.width) > self.SCREEN_WIDTH:
             raise AssertionError("left edge (%d) or right edge (%d) out of screen" % (area.x0, (area.x0 + area.width)))

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/speculos/mcu/ocr.py

@@ -120,14 +120,18 @@ class OCR:
     # Maximum space for a letter to be considered part of the same word
     MAX_BLANK_SPACE_NANO = 12
     MAX_BLANK_SPACE_STAX = 24
+    MAX_BLANK_SPACE_FLEX = 26
 
-    def __init__(self, model: str):
+    def __init__(self, model: str, use_bagl: bool):
         self.events: List[TextEvent] = []
         # Store the model of the device
         self.model = model
+        self.use_bagl = use_bagl
         # Maximum space for a letter to be considered part of the same word
         if model == "stax":
             self.max_blank_space = OCR.MAX_BLANK_SPACE_STAX
+        elif model == "flex":
+            self.max_blank_space = OCR.MAX_BLANK_SPACE_FLEX
         else:
             self.max_blank_space = OCR.MAX_BLANK_SPACE_NANO
 
@@ -215,7 +219,7 @@ class OCR:
         For older SKD versions, legacy behaviour is used: parsing internal
         fonts to find a matching bitmap.
         """
-        if self.model == "stax":
+        if not self.use_bagl:
             # Can be called via SephTag.NBGL_DRAW_IMAGE or SephTag.NBGL_DRAW_IMAGE_RLE
             # In both cases, data contains:
             # - area (sizeof(nbgl_area_t))

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/speculos/mcu/rle_custom.py

@@ -153,9 +153,8 @@ class RLECustomBase:
         if bits != 7:
             output += bytes([byte])
 
-        nb_bytes = len(data)/8
-        if len(data) % 8:
-            nb_bytes += 1
+        nb_bytes = (len(data)+7)//8
+
         assert len(output) == nb_bytes
 
         return output

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/speculos/mcu/screen.py

@@ -205,7 +205,7 @@ class Screen(Display):
         self.app = app
         self.app.set_screen(self)
         model = self._display_args.model
-        if model != "stax":
+        if self.use_bagl:
             self._gl = bagl.Bagl(app.widget, MODELS[model].screen_size, model)
         else:
             self._gl = nbgl.NBGL(app.widget, MODELS[model].screen_size, model)

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/speculos/mcu/screen_text.py

@@ -105,7 +105,7 @@ class TextScreen(Display):
 
         self.width, self.height = MODELS[display_args.model].screen_size
         self.m = TextWidget(self, display_args.model)
-        if display_args.model != "stax":
+        if self.use_bagl:
             self._gl = bagl.Bagl(self.m, MODELS[display_args.model].screen_size, display_args.model)
         else:
             raise NotImplementedError("This display can not emulate NBGL OS yet")

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/speculos/mcu/seproxyhal.py

@@ -245,6 +245,7 @@ class SeProxyHal(IODevice):
     def __init__(self,
                  sock: socket,
                  model: str,
+                 use_bagl: bool,
                  automation: Optional[Automation] = None,
                  automation_server: Optional[BroadcastInterface] = None,
                  transport: str = 'hid'):
@@ -265,7 +266,9 @@ class SeProxyHal(IODevice):
 
         self.usb = usb.USB(self.socket_helper.queue_packet, transport=transport)
 
-        self.ocr = OCR(model)
+        self.ocr = OCR(model, use_bagl)
+
+        self.use_bagl = use_bagl
 
         # A list of callback methods when an APDU response is received
         self.apdu_callbacks: List[Callable[[bytes], None]] = []
@@ -326,10 +329,10 @@ class SeProxyHal(IODevice):
                     screen.display.gl.update_screenshot()
                     screen.display.gl.update_public_screenshot()
 
-                if screen.display.model != "stax" and screen.display.screen_update():
+                if self.use_bagl and screen.display.screen_update():
                     if screen.display.model in ["nanox", "nanosp"]:
                         self.events += self.ocr.get_events()
-                elif screen.display.model == "stax":
+                elif not self.use_bagl:
                     self.events += self.ocr.get_events()
 
                 # Apply automation rules after having received a GENERAL_STATUS_LAST_COMMAND tag. It allows the
@@ -418,7 +421,7 @@ class SeProxyHal(IODevice):
         elif tag == SephTag.NBGL_REFRESH:
             assert isinstance(screen.display.gl, NBGL)
             screen.display.gl.refresh(data)
-            # Stax only
+            # Stax/Flex only
             # We have refreshed the screen, remember it for the next time we have SephTag.GENERAL_STATUS
             # then we'll perform a screen update and make public the resulting screenshot
             self.refreshed = True

{speculos-0.7.2.dev2 → speculos-0.7.2.dev18}/speculos/mcu/struct.py

@@ -18,6 +18,7 @@ MODELS: Dict[str, Model] = {
     'nanosp': Model('Nano SP', (128, 64), (5, 5), (10, 10)),
     'blue': Model('Blue', (320, 480), (13, 13), (26, 26)),
     'stax': Model('Stax', (400, 672), (13, 13), (26, 26)),
+    'flex': Model('Flex', (480, 600), (13, 13), (26, 26)),
 }
 
 
@@ -31,6 +32,7 @@ class DisplayArgs:
     pixel_size: int
     x: Optional[int]
     y: Optional[int]
+    use_bagl: bool
 
 
 class ServerArgs(NamedTuple):