Add token transfer with memo tx signing test

Author: agrojean-ledger

scripts/split_tx_util.py

@@ -30,7 +30,7 @@ def split_transaction(json_file: str) -> tuple[bytes, list[bytes], bytes, list[b
         json_tx = json.load(file)
 
     # Determine if the JSON is a full PrepareSubmissionResponse or just a PreparedTransaction
-    prepared_transaction = json_tx.get("prepared_transaction") or json_tx.get("preparedTransaction")
+    prepared_transaction = json_tx.get("prepared_transaction") or json_tx.get("preparedTransaction") or json_tx.get("json")
     if not prepared_transaction:
         prepared_transaction = json_tx
 

src/transaction/canonical_hash.c

@@ -617,7 +617,7 @@ static void encode_metadata(HashWriter *hw, const Metadata *m) {
                     (EncodeFn) encode_int64_by_ptr,
                     &m->max_ledger_effective_time);
 
-    encode_int64(hw, m->submission_time);
+    encode_int64(hw, m->preparation_time);
     encode_int32(hw, m->input_contracts_count);
 }
 

tests/application_client/canton_transaction.py

@@ -87,7 +87,15 @@ def from_bytes(cls, hexa: Union[bytes, BytesIO]):
     def get_hash_from_json(cls, json_file: str) -> bytes:
         with open(json_file, "r", encoding="utf-8") as file:
             data = json.load(file)
-        return base64.b64decode(data["prepared_transaction_hash"])
+
+        tx_hash = data.get("prepared_transaction_hash") or data.get("hash")
+        # Detect if base64 or hex encoding
+        if tx_hash:
+            try:
+                return bytes.fromhex(tx_hash)
+            except ValueError:
+                return base64.b64decode(tx_hash)
+        raise TransactionError("No hash found in JSON file")
 
     @classmethod
     def serialize_from_json_into_tx_parts(cls, json_file: str) -> tuple[bytes, list[bytes], bytes, list[bytes]]:

tests/snapshots/flex/test_sign_token_transfer_with_memo/00000.png

@@ -131,6 +131,16 @@ def test_sign_token_transfer(
         custom_screen_text="Sign transaction to",
     )
 
+def test_sign_token_transfer_with_memo(
+    backend: BackendInterface, scenario_navigator: NavigateWithScenario
+) -> None:
+    _sign_and_verify_prepared_transaction(
+        backend,
+        scenario_navigator,
+        tx_json="tests/tx_examples/token_transfer_with_memo.json",
+        custom_screen_text="Sign transaction to",
+    )
+
 def test_sign_preapproval_proposal(
     backend: BackendInterface, scenario_navigator: NavigateWithScenario
 ) -> None: