Session-based trezorlib

.github/workflows/core.yml

@@ -365,6 +365,7 @@ jobs:
     env:
       TREZOR_UPGRADE_TEST: core
       PYTEST_TIMEOUT: 400
+      TREZOR_PYTEST_LOGS_DIR: ${{ github.workspace }}/tests/
     steps:
       - uses: actions/checkout@v4
         with:
@@ -377,6 +378,13 @@ jobs:
       - uses: ./.github/actions/environment
       - run: nix-shell --run "tests/download_emulators.sh"
       - run: nix-shell --run "poetry run pytest tests/upgrade_tests"
+      - uses: actions/upload-artifact@v4
+        with:
+          name: core-test-upgrade-${{ matrix.model }}-${{ matrix.asan }}
+          path: |
+            tests/trezor.log
+          retention-days: 7
+        if: always()
 
 
   # Persistence tests - UI.
@@ -395,6 +403,7 @@ jobs:
     env:
       TREZOR_PROFILING: ${{ matrix.asan == 'noasan' && '1' || '0' }}
       PYTEST_TIMEOUT: 400
+      TREZOR_PYTEST_LOGS_DIR: ${{ github.workspace }}/tests/
     steps:
       - uses: actions/checkout@v4
         with:
@@ -417,6 +426,13 @@ jobs:
         if: always()
         continue-on-error: true
       - uses: ./.github/actions/upload-coverage
+      - uses: actions/upload-artifact@v4
+        with:
+          name: core-test-persistence-${{ matrix.model }}-${{ matrix.asan }}
+          path: |
+            tests/trezor.log
+          retention-days: 7
+        if: always()
 
   core_hwi_test:
     name: HWI tests

core/emu.py

@@ -282,9 +282,10 @@ def cli(
             label = "Emulator"
 
         assert emulator.client is not None
-        trezorlib.device.wipe(emulator.client)
+        trezorlib.device.wipe(emulator.client.get_seedless_session())
+
         trezorlib.debuglink.load_device(
-            emulator.client,
+            emulator.client.get_seedless_session(),
             mnemonics,
             pin=None,
             passphrase_protection=False,

core/tools/codegen/get_trezor_keys.py

@@ -2,7 +2,7 @@
 
 import binascii
 from trezorlib.client import TrezorClient
-from trezorlib.transport_hid import HidTransport
+from trezorlib.transport.hid import HidTransport
 
 devices = HidTransport.enumerate()
 if len(devices) > 0:

python/.changelog.d/4577.changed

@@ -0,0 +1 @@
+Changed trezorlib to session-based. Changes affect also trezorctl and tests.

python/requirements.txt

@@ -9,3 +9,4 @@ construct>=2.9,!=2.10.55
 typing_extensions>=4.7.1
 construct-classes>=0.1.2
 cryptography>=41
+platformdirs>=2

python/src/trezorlib/_internal/emulator.py

@@ -93,6 +93,8 @@ def client(self) -> TrezorClientDebugLink:
         """
         if self._client is None:
             raise RuntimeError
+        if self._client.is_invalidated:
+            self._client = self._client.get_new_client()
         return self._client
 
     def make_args(self) -> List[str]:
@@ -112,7 +114,7 @@ def wait_until_ready(self, timeout: float = EMULATOR_WAIT_TIME) -> None:
         start = time.monotonic()
         try:
             while True:
-                if transport._ping():
+                if transport.ping():
                     break
                 if self.process.poll() is not None:
                     raise RuntimeError("Emulator process died")

python/src/trezorlib/authentication.py

@@ -10,7 +10,7 @@
 from cryptography.hazmat.primitives.asymmetric import ec, utils
 
 from . import device
-from .client import TrezorClient
+from .transport.session import Session
 
 LOG = logging.getLogger(__name__)
 
@@ -349,7 +349,7 @@ def verify_authentication_response(
 
 
 def authenticate_device(
-    client: TrezorClient,
+    session: Session,
     challenge: bytes | None = None,
     *,
     whitelist: t.Collection[bytes] | None = None,
@@ -359,7 +359,7 @@ def authenticate_device(
     if challenge is None:
         challenge = secrets.token_bytes(16)
 
-    resp = device.authenticate(client, challenge)
+    resp = device.authenticate(session, challenge)
 
     return verify_authentication_response(
         challenge,

python/src/trezorlib/benchmark.py

@@ -19,16 +19,16 @@
 from . import messages
 
 if TYPE_CHECKING:
-    from .client import TrezorClient
+    from .transport.session import Session
 
 
 def list_names(
-    client: "TrezorClient",
+    session: "Session",
 ) -> messages.BenchmarkNames:
-    return client.call(messages.BenchmarkListNames(), expect=messages.BenchmarkNames)
+    return session.call(messages.BenchmarkListNames(), expect=messages.BenchmarkNames)
 
 
-def run(client: "TrezorClient", name: str) -> messages.BenchmarkResult:
-    return client.call(
+def run(session: "Session", name: str) -> messages.BenchmarkResult:
+    return session.call(
         messages.BenchmarkRun(name=name), expect=messages.BenchmarkResult
     )

python/src/trezorlib/binance.py

@@ -18,20 +18,19 @@
 
 from . import messages
 from .protobuf import dict_to_proto
-from .tools import session
 
 if TYPE_CHECKING:
-    from .client import TrezorClient
     from .tools import Address
+    from .transport.session import Session
 
 
 def get_address(
-    client: "TrezorClient",
+    session: "Session",
     address_n: "Address",
     show_display: bool = False,
     chunkify: bool = False,
 ) -> str:
-    return client.call(
+    return session.call(
         messages.BinanceGetAddress(
             address_n=address_n, show_display=show_display, chunkify=chunkify
         ),
@@ -40,17 +39,16 @@ def get_address(
 
 
 def get_public_key(
-    client: "TrezorClient", address_n: "Address", show_display: bool = False
+    session: "Session", address_n: "Address", show_display: bool = False
 ) -> bytes:
-    return client.call(
+    return session.call(
         messages.BinanceGetPublicKey(address_n=address_n, show_display=show_display),
         expect=messages.BinancePublicKey,
     ).public_key
 
 
-@session
 def sign_tx(
-    client: "TrezorClient", address_n: "Address", tx_json: dict, chunkify: bool = False
+    session: "Session", address_n: "Address", tx_json: dict, chunkify: bool = False
 ) -> messages.BinanceSignedTx:
     msg = tx_json["msgs"][0]
     tx_msg = tx_json.copy()
@@ -59,7 +57,7 @@ def sign_tx(
     tx_msg["chunkify"] = chunkify
     envelope = dict_to_proto(messages.BinanceSignTx, tx_msg)
 
-    client.call(envelope, expect=messages.BinanceTxRequest)
+    session.call(envelope, expect=messages.BinanceTxRequest)
 
     if "refid" in msg:
         msg = dict_to_proto(messages.BinanceCancelMsg, msg)
@@ -70,4 +68,4 @@ def sign_tx(
     else:
         raise ValueError("can not determine msg type")
 
-    return client.call(msg, expect=messages.BinanceSignedTx)
+    return session.call(msg, expect=messages.BinanceSignedTx)