From cbfdeceeddd604b1afc4cd9d4bf42101aa08e329 Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Sat, 27 Jul 2024 21:02:26 +0800
Subject: [PATCH] fix: hard-coded CLA byte (#138)

* chore: make clippy happy again

* fix: hard-coded CLA byte
---
 crates/bip32/src/xkeys.rs                  | 2 +-
 crates/ledger/src/common.rs                | 7 ++++++-
 crates/ledger/src/transports/native/hid.rs | 2 +-
 crates/ledger/src/transports/wasm.rs       | 1 +
 crates/ledger/tests/integration.rs         | 1 +
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/crates/bip32/src/xkeys.rs b/crates/bip32/src/xkeys.rs
index a2d73289..5cb0bbed 100644
--- a/crates/bip32/src/xkeys.rs
+++ b/crates/bip32/src/xkeys.rs
@@ -112,7 +112,7 @@ impl AsRef<ecdsa::SigningKey> for XPriv {
 
 impl XPriv {
     /// Instantiate a new XPriv.
-    pub fn new(key: ecdsa::SigningKey, xkey_info: XKeyInfo) -> Self {
+    pub const fn new(key: ecdsa::SigningKey, xkey_info: XKeyInfo) -> Self {
         Self { key, xkey_info }
     }
 
diff --git a/crates/ledger/src/common.rs b/crates/ledger/src/common.rs
index 496ff075..7c42c840 100644
--- a/crates/ledger/src/common.rs
+++ b/crates/ledger/src/common.rs
@@ -63,6 +63,8 @@ impl AsRef<[u8]> for APDUData {
 /// additional format details
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct APDUCommand {
+    /// The application identifier.
+    pub cla: u8,
     /// The instruction code.
     pub ins: u8,
     /// Instruction parameter 1
@@ -78,6 +80,7 @@ pub struct APDUCommand {
 impl std::fmt::Display for APDUCommand {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("APDUCommand")
+            .field("cla", &self.cla)
             .field("ins", &self.ins)
             .field("p1", &self.p1)
             .field("p2", &self.p2)
@@ -101,7 +104,7 @@ impl APDUCommand {
 
     /// Write the APDU packet to the specified Write interface
     pub fn write_to<W: std::io::Write>(&self, w: &mut W) -> Result<usize, std::io::Error> {
-        w.write_all(&[0xE0, self.ins, self.p1, self.p2])?;
+        w.write_all(&[self.cla, self.ins, self.p1, self.p2])?;
         if !self.data.is_empty() {
             w.write_all(&[self.data.len() as u8])?;
             w.write_all(self.data.as_ref())?;
@@ -311,6 +314,7 @@ mod test {
         let data: &[u8] = &[0, 0, 0, 1, 0, 0, 0, 1];
 
         let command = APDUCommand {
+            cla: 0xe0,
             ins: 0x01,
             p1: 0x00,
             p2: 0x00,
@@ -323,6 +327,7 @@ mod test {
         assert_eq!(serialized_command, expected);
 
         let command = APDUCommand {
+            cla: 0xe0,
             ins: 0x01,
             p1: 0x00,
             p2: 0x00,
diff --git a/crates/ledger/src/transports/native/hid.rs b/crates/ledger/src/transports/native/hid.rs
index 0f2be4a2..1cf3f8db 100644
--- a/crates/ledger/src/transports/native/hid.rs
+++ b/crates/ledger/src/transports/native/hid.rs
@@ -210,7 +210,7 @@ fn open_device(api: &HidApi, device: &DeviceInfo) -> Result<HidDevice, NativeTra
 
 impl TransportNativeHID {
     /// Instantiate from a device.
-    fn from_device(device: HidDevice) -> Self {
+    const fn from_device(device: HidDevice) -> Self {
         Self {
             device: Mutex::new(device),
         }
diff --git a/crates/ledger/src/transports/wasm.rs b/crates/ledger/src/transports/wasm.rs
index 65c5d835..1cc5ed53 100644
--- a/crates/ledger/src/transports/wasm.rs
+++ b/crates/ledger/src/transports/wasm.rs
@@ -100,6 +100,7 @@ impl LedgerTransport {
 
         // Ethereum `get_app_version`
         let command = APDUCommand {
+            cla: 0xe0,
             ins: 0x06,
             p1: 0x00,
             p2: 0x00,
diff --git a/crates/ledger/tests/integration.rs b/crates/ledger/tests/integration.rs
index f18b5c1c..747ea5ec 100644
--- a/crates/ledger/tests/integration.rs
+++ b/crates/ledger/tests/integration.rs
@@ -26,6 +26,7 @@ async fn exchange() {
     let buf: &[u8] = &[];
     // Ethereum `get_app_version`
     let command = APDUCommand {
+        cla: 0xe0,
         ins: 0x06,
         p1: 0x00,
         p2: 0x00,