Transfer changes from other feature branch

Author: OBorce

Cargo.lock

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 messages = { path = "./messages" }
-ledger_device_sdk = "1.34.0"
+ledger_device_sdk = "1.35.1"
 ledger_secure_sdk_sys = "1.16.1"
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
 bech32 = { version = "0.11", default-features = false, features = ["alloc"] }

Cargo.toml

@@ -402,16 +402,24 @@ pub enum StatusWord {
     // Standard Ledger APDU Codes
     #[display("Success")]
     Ok = 0x9000,
+    #[display("Nothing received")]
+    NothingReceived = 0x6982,
     #[display("User cancelled")]
     Deny = 0x6985,
     #[display("CLA not supported")]
     ClaNotSupported = 0x6E00,
-    #[display("Wrong P1/P2 parameters")]
-    WrongP1P2 = 0x6B00,
     #[display("Instruction not supported")]
-    InsNotSupported = 0x6D00,
+    InsNotSupported = 0x6E01,
+    #[display("Wrong P1/P2 parameters")]
+    WrongP1P2 = 0x6E02,
     #[display("Wrong APDU length")]
-    WrongApduLength = 0x6700,
+    WrongApduLength = 0x6E03,
+    #[display("Unknown")]
+    Unknown = 0x6D00,
+    #[display("Panic")]
+    Panic = 0xE000,
+    #[display("Device locked")]
+    DeviceLocked = 0x5515,
 
     // App Specific Errors (0xB...)
     #[display("Transaction display failed")]
@@ -454,6 +462,8 @@ pub enum StatusWord {
     MaxBufferLenExceeded = 0xB012,
     #[display("Different input commitment hash")]
     DifferentInputCommitmentHash = 0xB013,
+    #[display("Invalid Timestamp")]
+    InvalidTimestamp = 0xB014,
 
     // Ecc Errors
     #[display("ECC Carry")]

messages/src/lib.rs

@@ -39,3 +39,18 @@ pub fn cx_err_to_status(e: CxError) -> StatusWord {
         CxError::GenericError => StatusWord::EccGenericError,
     }
 }
+
+pub fn sdk_err_to_status(e: ledger_device_sdk::io::StatusWords) -> StatusWord {
+    match e {
+        ledger_device_sdk::io::StatusWords::Ok => StatusWord::Ok,
+        ledger_device_sdk::io::StatusWords::BadCla => StatusWord::ClaNotSupported,
+        ledger_device_sdk::io::StatusWords::NothingReceived => StatusWord::NothingReceived,
+        ledger_device_sdk::io::StatusWords::BadIns => StatusWord::InsNotSupported,
+        ledger_device_sdk::io::StatusWords::BadP1P2 => StatusWord::WrongP1P2,
+        ledger_device_sdk::io::StatusWords::BadLen => StatusWord::WrongApduLength,
+        ledger_device_sdk::io::StatusWords::UserCancelled => StatusWord::Deny,
+        ledger_device_sdk::io::StatusWords::Unknown => StatusWord::Unknown,
+        ledger_device_sdk::io::StatusWords::Panic => StatusWord::Panic,
+        ledger_device_sdk::io::StatusWords::DeviceLocked => StatusWord::DeviceLocked,
+    }
+}

src/errors.rs

@@ -420,17 +420,17 @@ fn handle_input_req(
 }
 
 fn handle_input_commitment_req(
-    req: Box<SighashInputCommitment>,
+    req: &SighashInputCommitment,
     mut ctx: Box<TxParsingInputCommitmentsContext>,
     review: &NbglStreamingReview,
 ) -> Result<TxParsingContext, StatusWord> {
-    update_hash(&req, &mut ctx.input_commitments_hasher)?;
-    update_hash(&req, &mut ctx.tx_hasher)?;
+    update_hash(req, &mut ctx.input_commitments_hasher)?;
+    update_hash(req, &mut ctx.tx_hasher)?;
     ctx.advance_next_input_additional_info_step(review)
 }
 
 fn handle_output_req(
-    req: Box<TxOutputReq>,
+    req: &TxOutputReq,
     mut ctx: Box<TxParsingOutputsContext>,
     review: &NbglStreamingReview,
 ) -> Result<TxParsingContext, StatusWord> {
@@ -453,10 +453,10 @@ pub fn handle_sign_tx(
             handle_input_req(req, ctx)?
         }
         (SignTxReq::InputCommitment(req), TxParsingContext::ParsingInputCommitments(ctx)) => {
-            handle_input_commitment_req(req, ctx, review)?
+            handle_input_commitment_req(req.as_ref(), ctx, review)?
         }
         (SignTxReq::Output(req), TxParsingContext::ParsingOutputs(ctx)) => {
-            handle_output_req(req, ctx, review)?
+            handle_output_req(req.as_ref(), ctx, review)?
         }
         (SignTxReq::NextSignature, TxParsingContext::Signing(ctx)) => {
             TxParsingContext::Signing(ctx)

src/handlers/sign_tx/mod.rs

@@ -47,15 +47,14 @@ use app_ui::menu::ui_menu_main;
 use handlers::{
     get_public_key::handle_get_public_key,
     sign_message::{handle_sign_message, setup_sign_message, SignMessageContext},
-    sign_tx::{setup_sign_tx, TxParsingContext},
+    sign_tx::{setup_sign_tx, TxParsingContext, handle_sign_tx},
 };
+use errors::sdk_err_to_status;
 use messages::{
     decode_all, encode, Ins, PubKeyP1, Response, SignP1, StatusWord, APDU_CLASS, MAX_ADPU_DATA_LEN,
     P2_DONE, P2_MORE,
 };
 
-use crate::handlers::sign_tx::handle_sign_tx;
-
 ledger_device_sdk::set_panic!(ledger_device_sdk::exiting_panic);
 
 pub const MAX_BUFFER_LEN: usize = 4 * MAX_ADPU_DATA_LEN;
@@ -98,7 +97,7 @@ impl ApduTransport {
     /// - If `P2 == P2_DONE`, it finishes accumulation and returns `Ok(Some(RawInstruction))`.
     pub fn receive(&mut self, comm: &mut Comm) -> Result<ReceiveInstructionResult, StatusWord> {
         let header: ApduHeader = comm.next_command();
-        let data = comm.get_data().map_err(|_| StatusWord::WrongApduLength)?;
+        let data = comm.get_data().map_err(sdk_err_to_status)?;
 
         // Validation: If we are in the middle of a stream, INS and P1 must match
         if let (Some(curr_ins), Some(curr_p1)) = (self.current_ins, self.current_p1) {
@@ -331,8 +330,7 @@ fn handle_command(cmd: &Command, ctx: &mut AppContext) -> Result<Response, Statu
                     Some(DataContext::SignMessageContext(ctx)) => ctx,
                     _ => return Err(StatusWord::WrongContext),
                 };
-                let response = handle_sign_message(data, msg_ctx).map(Response::MessageSignature);
-                response
+                handle_sign_message(data, msg_ctx).map(Response::MessageSignature)
             }
         },
         Command::Ping => Ok(Response::Pong),

src/main.rs

@@ -22,6 +22,11 @@
 
 CLA: int = 0xE1
 
+@dataclass
+class ReviewTransaction:
+    transaction: Transaction
+    has_command_input: bool
+    review_custom_screen_text: str
 
 @dataclass
 class SignTxStep:
@@ -65,8 +70,8 @@ class InsType(IntEnum):
 class Errors(IntEnum):
     SW_DENY = 0x6985
     SW_CLA_NOT_SUPPORTED = 0x6E00
-    SW_INS_NOT_SUPPORTED = 0x6D00
-    SW_WRONG_P1P2 = 0x6B00
+    SW_INS_NOT_SUPPORTED = 0x6E01
+    SW_WRONG_P1P2 = 0x6E02
     SW_WRONG_APDU_LENGTH = 0x6E03
 
     SW_WRONG_RESPONSE_LENGTH = 0xB000
@@ -137,11 +142,19 @@ def sign_message(
 
         for chunk in chunks[:-1]:
             self.backend.exchange(
-                cla=CLA, ins=InsType.SIGN_MESSAGE, p1=SignMessageP1.P1_NEXT, p2=P2.P2_MORE, data=chunk
+                cla=CLA,
+                ins=InsType.SIGN_MESSAGE,
+                p1=SignMessageP1.P1_NEXT,
+                p2=P2.P2_MORE,
+                data=chunk
             )
 
         with self.backend.exchange_async(
-            cla=CLA, ins=InsType.SIGN_MESSAGE, p1=SignMessageP1.P1_NEXT, p2=P2.P2_LAST, data=chunks[-1]
+            cla=CLA,
+            ins=InsType.SIGN_MESSAGE,
+            p1=SignMessageP1.P1_NEXT,
+            p2=P2.P2_LAST,
+            data=chunks[-1]
         ) as response:
             yield response
 
@@ -202,7 +215,7 @@ def sign_tx(self, transaction: Transaction) -> Generator[SignTxStep, None, None]
         ):
             kind = "start"
             yield SignTxStep(kind=kind, index=0)
-        
+
 
         # ---- OUTPUTS ----
         print("streaming outputs")
@@ -301,7 +314,17 @@ def pack_derivation_path(derivation_path: str) -> bytes:
     return path_obj.encode(path).data
 
 
-def sign_tx_review(client, device, navigator, scenario_navigator, transaction, has_command_input, review_custom_screen_text):
+def sign_tx_review(
+    client,
+    device,
+    navigator,
+    scenario_navigator,
+    review_transaction: ReviewTransaction,
+):
+    transaction = review_transaction.transaction
+    has_command_input = review_transaction.has_command_input
+    review_custom_screen_text = review_transaction.review_custom_screen_text
+
     start_idx = 0
     if not device.is_nano:
         instruction = NavInsID.SWIPE_CENTER_TO_LEFT
@@ -370,7 +393,11 @@ def sign_tx_review(client, device, navigator, scenario_navigator, transaction, h
             start_idx += 10
 
         elif step.kind == "final":
-            scenario = NavigationScenarioData(scenario_navigator.device, scenario_navigator.backend, UseCase.TX_REVIEW, True)
+            scenario = NavigationScenarioData(
+                scenario_navigator.device,
+                scenario_navigator.backend,
+                UseCase.TX_REVIEW,
+                True)
             navigator.navigate_until_text_and_compare(
                 navigate_instruction=scenario.navigation,
                 validation_instructions=scenario.validation,
@@ -386,4 +413,4 @@ def sign_tx_review(client, device, navigator, scenario_navigator, transaction, h
 
     assert len(responses) == len(transaction.inputs)
     for response in responses:
-        assert len(response) == TX_RESPONSE_SIZE
+        assert len(response) == TX_RESPONSE_SIZE

tests/application_client/mintlayer_command_sender.py

@@ -51,12 +51,7 @@ def unpack_get_app_and_version_response(response: bytes) -> Tuple[str, str]:
 
 
 # Unpack from response:
-# response = pub_key_len (1)
-#            pub_key (var)
-#            chain_code_len (1)
-#            chain_code (var)
 def unpack_get_public_key_response(response: bytes) -> Tuple[int, bytes, int, bytes]:
-    print("response bytes: ", len(response))
     response_bytes = scalecodec.base.ScaleBytes(response)
     response_obj = scalecodec.base.RuntimeConfiguration().create_scale_object(
         "Response", data=response_bytes
@@ -79,24 +74,13 @@ def unpack_get_public_key_response(response: bytes) -> Tuple[int, bytes, int, by
 
 
 # Unpack from response:
-# response = sig_len (1)
-#            sig (var)
-def unpack_sign_message_response(response: bytes) -> Tuple[int, bytes]:
-    response, sig_len, sig = pop_size_prefixed_buf_from_buf(response)
-
-    assert sig_len == 64
-    assert len(response) == 0
-    return sig_len, sig
-
-
-# Unpack from response:
-# response = der_sig_len (1)
-#            der_sig (var)
-#            v (1)
-def unpack_sign_tx_response(response: bytes) -> Tuple[int, bytes, int]:
-    response, der_sig_len, der_sig = pop_size_prefixed_buf_from_buf(response)
-    response, v = pop_sized_buf_from_buffer(response, 1)
-
-    assert len(response) == 0
-
-    return der_sig_len, der_sig, int.from_bytes(v, byteorder="big")
+def unpack_sign_message_response(response: bytes) -> bytes:
+    response_bytes = scalecodec.base.ScaleBytes(response)
+    response_obj = scalecodec.base.RuntimeConfiguration().create_scale_object(
+        "Response", data=response_bytes
+    )
+    resp = response_obj.decode()
+    assert resp["MessageSignature"] is not None
+    signature = bytes.fromhex(resp["MessageSignature"]["signature"][2:])
+    assert len(signature) == 64
+    return signature