fix(core/ui): timer handling for rust layouts

[no changelog]

core/src/trezor/loop.py

@@ -572,24 +572,3 @@ class spawn(Syscall):
         is True, it would be calling close on self, which will result in a ValueError.
         """
         return self.task is this_task
-
-
-class Timer(Syscall):
-    def __init__(self) -> None:
-        self.task: Task | None = None
-        # Event::Attach is evaluated before task is set. Use this list to
-        # buffer timers until task is set.
-        self.before_task: list[tuple[int, Any]] = []
-
-    def handle(self, task: Task) -> None:
-        self.task = task
-        for deadline, value in self.before_task:
-            schedule(self.task, value, deadline)
-        self.before_task.clear()
-
-    def schedule(self, deadline: int, value: Any) -> None:
-        deadline = utime.ticks_add(utime.ticks_ms(), deadline)
-        if self.task is not None:
-            schedule(self.task, value, deadline)
-        else:
-            self.before_task.append((deadline, value))

core/src/trezor/ui/layouts/common.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
 
-from trezor import log, wire, workflow
+from trezor import log, utils, wire, workflow
 from trezor.enums import ButtonRequestType
 from trezor.messages import ButtonAck, ButtonRequest
 

core/src/trezor/ui/layouts/tr/__init__.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING, Sequence
 
-from trezor import io, log, loop, ui, wire, workflow
+from trezor import log, ui, wire
 from trezor.enums import ButtonRequestType
 from trezor.utils import DISABLE_ANIMATION
 
@@ -10,7 +10,7 @@ from ...components.common.confirm import is_confirmed
 from ..common import button_request, interact
 
 if TYPE_CHECKING:
-    from typing import Any, NoReturn, Type
+    from typing import NoReturn, Type
 
     ExceptionType = BaseException | Type[BaseException]
 

core/src/trezor/ui/layouts/tt_v2/__init__.py

@@ -1,3 +1,5 @@
+import utime
+import utimeq
 from typing import TYPE_CHECKING
 
 from trezor import io, log, loop, ui
@@ -35,15 +37,19 @@ class RustLayout(ui.Layout):
     def __init__(self, layout: Any, is_backup: bool = False):
         super().__init__()
         self.layout = layout
-        self.timer = loop.Timer()
+        self.timers = utimeq.utimeq(64)
-        self.layout.attach_timer_fn(self.set_timer)
+        self.timer_task: loop.Task | None = None
         self.is_backup = is_backup
 
         if __debug__ and self.is_backup:
             self.notify_backup()
 
-    def set_timer(self, token: int, deadline: int) -> None:
+    def set_timer(self, token: int, duration: int) -> None:
-        self.timer.schedule(deadline, token)
+        deadline = utime.ticks_add(utime.ticks_ms(), duration)
+        self.timers.push(deadline, token, token)
+        if self.timer_task:
+            min_deadline = self.timers.peektime()
+            loop.schedule(self.timer_task, min_deadline, min_deadline, reschedule=True)
 
     def request_complete_repaint(self) -> None:
         msg = self.layout.request_complete_repaint()
@@ -157,6 +163,7 @@ class RustLayout(ui.Layout):
         from trezor import workflow
 
         touch = loop.wait(io.TOUCH)
+        self.layout.attach_timer_fn(self.set_timer)
         self._first_paint()
         # self.layout.bounds()
         while True:
@@ -172,13 +179,20 @@ class RustLayout(ui.Layout):
             # self.layout.bounds()
 
     def handle_timers(self) -> loop.Task:  # type: ignore [awaitable-is-generator]
+        entry = [0, 0, 0]
         while True:
-            # Using `yield` instead of `await` to avoid allocations.
+            delay = 1000
-            token = yield self.timer
+            if self.timers:
-            msg = self.layout.timer(token)
+                delay = self.timers.peektime() - utime.ticks_ms()
-            if msg is not None:
+            yield loop.sleep(max(0, delay))
-                raise ui.Result(msg)
+
-            self._paint()
+            now = utime.ticks_ms()
+            while self.timers and self.timers.peektime() <= now:
+                self.timers.pop(entry)
+                msg = self.layout.timer(entry[1])
+                if msg is not None:
+                    raise ui.Result(msg)
+                self._paint()
 
     def page_count(self) -> int:
         return self.layout.page_count()