Change mintlayer sing tx response message

mintlayer · Nov 14, 2024 · 64d46a0 · 64d46a0
1 parent b88b27e
commit 64d46a0
Show file tree

Hide file tree

Showing 7 changed files with 391 additions and 221 deletions.
diff --git a/common/protob/messages-mintlayer.proto b/common/protob/messages-mintlayer.proto
@@ -86,7 +86,7 @@ message MintlayerSignTx {
 message MintlayerTxRequest {
     optional MintlayerRequestType request_type = 1;              // what should be filled in TxAck message?
     optional MintlayerTxRequestDetailsType details = 2;          // request for tx details
-    repeated MintlayerTxRequestSerializedType serialized = 3;    // serialized data and request for next
+    optional MintlayerTxRequestSerializedType serialized = 3;    // serialized data and request for next
     /**
     * Type of information required by transaction signing process
     */
@@ -104,19 +104,25 @@ message MintlayerTxRequest {
         optional bytes tx_hash = 2;             // tx_hash of requested transaction
     }
     /**
-    * Structure representing request details
+    * Structure representing a single signature
     */
     message MintlayerSignature {
         required bytes signature = 1;             // a single signature
         optional uint32 multisig_idx = 2;         // in case of multisig the index of the key
     }
     /**
+    * Structure representing all of the signatures for a single input, can be multiple for a multisig address
+    */
+    message MintlayerSignatures {
+        optional uint32 signature_index = 1;                  // 'signature' field contains signed input of this index
+        repeated MintlayerSignature signatures = 2;           // all signatures for an input
+    }
+    /**
     * Structure representing serialized data
     */
     message MintlayerTxRequestSerializedType {
-        optional uint32 signature_index = 1;                  // 'signature' field contains signed input of this index
-        repeated MintlayerSignature signatures = 2;           // signature of the signature_index input
-        optional bytes serialized_tx = 3;                     // part of serialized and signed transaction
+        repeated MintlayerSignatures signatures = 1;          // signature of the signature_index input
+        optional bytes serialized_tx = 2;                     // the serialized tx
     }
 }
 

diff --git a/core/src/apps/mintlayer/sign_tx/signer.py b/core/src/apps/mintlayer/sign_tx/signer.py
@@ -8,6 +8,7 @@
 from trezor.crypto.hashlib import blake2b
 from trezor.messages import (
     MintlayerSignature,
+    MintlayerSignatures,
     MintlayerSignTx,
     MintlayerTxInput,
     MintlayerTxOutput,
@@ -510,15 +511,15 @@ async def step6_finish(
         self, signatures: List[List[Tuple[bytes, int | None]]]
     ) -> None:
         sigs = [
-            MintlayerTxRequestSerializedType(
+            MintlayerSignatures(
                 signature_index=i,
                 signatures=[
                     MintlayerSignature(signature=s[0], multisig_idx=s[1]) for s in sigs
                 ],
             )
             for i, sigs in enumerate(signatures)
         ]
-        self.tx_req.serialized = sigs
+        self.tx_req.serialized = MintlayerTxRequestSerializedType(signatures=sigs)
         await helpers.request_tx_finish(self.tx_req)
 
 

diff --git a/core/src/trezor/messages.py b/core/src/trezor/messages.py
diff --git a/python/src/trezorlib/messages.py b/python/src/trezorlib/messages.py
diff --git a/python/src/trezorlib/mintlayer.py b/python/src/trezorlib/mintlayer.py
@@ -81,7 +81,7 @@ def sign_tx(
     version: Optional["int"] = 1,
     serialize: Optional["bool"] = True,
     chunkify: Optional["bool"] = None,
-) -> List[messages.MintlayerTxRequestSerializedType]:
+) -> List[messages.MintlayerSignatures]:
     res = client.call(
         messages.MintlayerSignTx(
             outputs_count=len(outputs),
@@ -95,7 +95,10 @@ def sign_tx(
     R = messages.MintlayerRequestType
     while isinstance(res, messages.MintlayerTxRequest):
         if res.request_type == R.TXFINISHED:
-            return list(res.serialized)
+            if res.serialized:
+                return list(res.serialized.signatures)
+            else:
+                return []
 
         if res.request_type == R.TXINPUT and res.details is not None:
             assert res.details.request_index is not None

diff --git a/rust/trezor-client/src/client/mintlayer.rs b/rust/trezor-client/src/client/mintlayer.rs
@@ -152,6 +152,7 @@ impl Trezor {
                 MintlayerRequestType::TXFINISHED => {
                     return Ok(response
                         .serialized
+                        .signatures
                         .iter()
                         .map(|s| {
                             s.signatures