change network to protocol magic in cardano

trezorlib/cardano.py

@@ -41,14 +41,14 @@ def sign_tx(
     inputs: List[messages.CardanoTxInputType],
     outputs: List[messages.CardanoTxOutputType],
     transactions: List[bytes],
-    network,
+    protocol_magic,
 ):
     response = client.call(
         messages.CardanoSignTx(
             inputs=inputs,
             outputs=outputs,
             transactions_count=len(transactions),
-            network=network,
+            protocol_magic=protocol_magic,
         )
     )
 

trezorlib/tests/device_tests/test_msg_cardano_sign_transaction.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the License along with this library.
 # If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.
 
+import time
+
 import pytest
 
 from trezorlib import cardano, messages
@@ -21,10 +23,10 @@ from trezorlib import cardano, messages
 from .conftest import setup_client
 
 VECTORS = [
-    # Mainnet transaction
+    # Mainnet transaction without change
     (
-        # network
-        2,
+        # protocol magic (mainnet)
+        764824073,
         # inputs
         [
             {
@@ -50,10 +52,40 @@ VECTORS = [
         # tx body
         "82839f8200d81858248258201af8fa0b754ff99253d983894e63a2b09cbb56c833ba18c3384210163f63dcfc00ff9f8282d818582183581c9e1c71de652ec8b85fec296f0685ca3988781c94a2e1a5d89d92f45fa0001a0d0c25611a002dd2e8ffa0818200d818588582584089053545a6c254b0d9b1464e48d2b5fcf91d4e25c128afb1fcfc61d0843338ea26308151516f3b0e02bb1638142747863c520273ce9bd3e5cd91e1d46fe2a6355840312c01c27317415b0b8acc86aa789da877fe7e15c65b7ea4c4565d8739117f5f6d9d38bf5d058f7be809b2b9b06c1d79fc6b20f9a4d76d8c89bae333edf5680c",
     ),
+    # Mainnet transaction with change
+    (
+        # protocol magic (mainnet)
+        764824073,
+        # inputs
+        [
+            {
+                "path": "m/44'/1815'/0'/0/1",
+                "prev_hash": "1af8fa0b754ff99253d983894e63a2b09cbb56c833ba18c3384210163f63dcfc",
+                "prev_index": 0,
+                "type": 0,
+            }
+        ],
+        # outputs
+        [
+            {
+                "address": "Ae2tdPwUPEZCanmBz5g2GEwFqKTKpNJcGYPKfDxoNeKZ8bRHr8366kseiK2",
+                "amount": "3003112",
+            },
+            {"path": "m/44'/1815'/0'/0/1", "amount": "1000000"},
+        ],
+        # transactions
+        [
+            "839f8200d818582482582008abb575fac4c39d5bf80683f7f0c37e48f4e3d96e37d1f6611919a7241b456600ff9f8282d818582183581cda4da43db3fca93695e71dab839e72271204d28b9d964d306b8800a8a0001a7a6916a51a00305becffa0"
+        ],
+        # tx hash
+        "40bf94518f31aba7779dd99aa71fe867887bcb3e0bac2c6dc33d3f20ec74a6b1",
+        # tx body
+        "82839f8200d81858248258201af8fa0b754ff99253d983894e63a2b09cbb56c833ba18c3384210163f63dcfc00ff9f8282d818582183581c9e1c71de652ec8b85fec296f0685ca3988781c94a2e1a5d89d92f45fa0001a0d0c25611a002dd2e88282d818582183581cda4da43db3fca93695e71dab839e72271204d28b9d964d306b8800a8a0001a7a6916a51a000f4240ffa0818200d818588582584089053545a6c254b0d9b1464e48d2b5fcf91d4e25c128afb1fcfc61d0843338ea26308151516f3b0e02bb1638142747863c520273ce9bd3e5cd91e1d46fe2a63558400b47193163462023bdb72f03b2f6afc8e3645dbc9252cb70f7516da402ce3b8468e4a60929674de5862d6253315008e07b60aa189f5c455dd272ff1c84c89d0c",
+    ),
     # Testnet transaction
     (
-        # network
-        1,
+        # protocol magic (testnet)
+        1097911063,
         # inputs
         [
             {
@@ -85,9 +117,11 @@ VECTORS = [
 @pytest.mark.cardano
 @pytest.mark.skip_t1  # T1 support is not planned
 @setup_client()
-@pytest.mark.parametrize("network,inputs,outputs,transactions,tx_hash,tx_body", VECTORS)
+@pytest.mark.parametrize(
+    "protocol_magic,inputs,outputs,transactions,tx_hash,tx_body", VECTORS
+)
 def test_cardano_sign_tx(
-    client, network, inputs, outputs, transactions, tx_hash, tx_body
+    client, protocol_magic, inputs, outputs, transactions, tx_hash, tx_body
 ):
     inputs = [cardano.create_input(i) for i in inputs]
     outputs = [cardano.create_output(o) for o in outputs]
@@ -96,17 +130,26 @@ def test_cardano_sign_tx(
         messages.CardanoTxRequest(tx_index=i) for i in range(len(transactions))
     ]
     expected_responses += [
-        messages.ButtonRequest(code=messages.ButtonRequestType.Other),
-        messages.ButtonRequest(code=messages.ButtonRequestType.Other),
         messages.ButtonRequest(code=messages.ButtonRequestType.Other),
         messages.ButtonRequest(code=messages.ButtonRequestType.Other),
         messages.CardanoSignedTx(),
     ]
 
+    def input_flow():
+        client.debug.swipe_down()
+        yield
+        client.debug.press_yes()
+        time.sleep(1)
+        client.debug.swipe_down()
+        yield
+        client.debug.press_yes()
+
     with client:
+
         client.set_expected_responses(expected_responses)
+        client.set_input_flow(input_flow)
         response = cardano.sign_tx(
-            client, inputs, outputs, transactions, network=network
+            client, inputs, outputs, transactions, protocol_magic
         )
         assert response.tx_hash.hex() == tx_hash
         assert response.tx_body.hex() == tx_body

vendor/trezor-common

@@ -1 +1 @@
-Subproject commit 60f43b2db31e3eac1da7f483e13773a1a61bd431
+Subproject commit b947aa3d45af58605f8f090078a2de3d5878571d