fix!: change auth_delay to return u8

notmandatory · notmandatory · commit e0afe8c23745 · 2026-04-07T12:58:43.000-05:00
API BREAKING change.
diff --git a/README.md b/README.md
@@ -79,7 +79,7 @@ just stop # stop emulator
 #### Run CLI with desktop USB PCSC NFC card reader
 
 ```
-just run --help
+just run -- --help
 just run certs
 just run read
 ```
diff --git a/cktap-ffi/src/sats_card.rs b/cktap-ffi/src/sats_card.rs
@@ -1,4 +1,4 @@
-// Copyright (c) 2025 rust-cktap contributors
+// Copyright (c) 2025-2026 rust-cktap contributors
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use crate::check_cert;
@@ -48,7 +48,7 @@ impl SatsCard {
             addr: card.addr.clone(),
             pubkey,
             card_ident: card.card_ident(),
-            auth_delay: card.auth_delay().map(|d| d as u8),
+            auth_delay: card.auth_delay().clone(),
         }
     }
 
diff --git a/cktap-ffi/src/sats_chip.rs b/cktap-ffi/src/sats_chip.rs
@@ -1,4 +1,4 @@
-// Copyright (c) 2025 rust-cktap contributors
+// Copyright (c) 2025-2026 rust-cktap contributors
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use crate::error::{
@@ -38,7 +38,7 @@ impl SatsChip {
                 .map(|p| p.iter().map(|&p| p as u64).collect()),
             pubkey: card.pubkey().to_string(),
             card_ident: card.card_ident(),
-            auth_delay: card.auth_delay().map(|d| d as u8),
+            auth_delay: card.auth_delay().clone(),
         }
     }
 
diff --git a/cktap-ffi/src/tap_signer.rs b/cktap-ffi/src/tap_signer.rs
@@ -1,4 +1,4 @@
-// Copyright (c) 2025 rust-cktap contributors
+// Copyright (c) 2025-2026 rust-cktap contributors
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use crate::error::{
@@ -41,7 +41,7 @@ impl TapSigner {
             num_backups: card.num_backups.unwrap_or_default() as u64,
             pubkey: card.pubkey().to_string(),
             card_ident: card.card_ident(),
-            auth_delay: card.auth_delay().map(|d| d as u8),
+            auth_delay: card.auth_delay().clone(),
         }
     }
 
diff --git a/lib/src/apdu.rs b/lib/src/apdu.rs
@@ -1,4 +1,4 @@
-// Copyright (c) 2025 rust-cktap contributors
+// Copyright (c) 2025-2026 rust-cktap contributors
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 /// An Application Protocol Data Unit (APDU) is the unit of communication between a smart card
@@ -132,7 +132,7 @@ pub struct StatusResponse {
     /// normal operation begins. If the CVC value is incorrect, the 15-second delay between
     /// attempts continues.
     #[serde(default)]
-    pub auth_delay: Option<usize>,
+    pub auth_delay: Option<u8>,
 }
 
 impl ResponseApdu for StatusResponse {}
@@ -628,7 +628,7 @@ pub struct WaitResponse {
     success: bool,
     /// how much more delay is now required
     #[serde(default)]
-    pub(crate) auth_delay: usize,
+    pub(crate) auth_delay: u8,
 }
 
 impl ResponseApdu for WaitResponse {}
diff --git a/lib/src/sats_card.rs b/lib/src/sats_card.rs
@@ -1,4 +1,4 @@
-// Copyright (c) 2025 rust-cktap contributors
+// Copyright (c) 2025-2026 rust-cktap contributors
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use crate::CkTapError;
@@ -32,7 +32,7 @@ pub struct SatsCard {
     pub addr: Option<String>,
     pub pubkey: PublicKey,
     pub card_nonce: [u8; 16],
-    pub auth_delay: Option<usize>,
+    pub auth_delay: Option<u8>,
 }
 
 impl Authentication for SatsCard {
@@ -56,11 +56,11 @@ impl Authentication for SatsCard {
         self.card_nonce = new_nonce;
     }
 
-    fn auth_delay(&self) -> &Option<usize> {
+    fn auth_delay(&self) -> &Option<u8> {
         &self.auth_delay
     }
 
-    fn set_auth_delay(&mut self, auth_delay: Option<usize>) {
+    fn set_auth_delay(&mut self, auth_delay: Option<u8>) {
         self.auth_delay = auth_delay;
     }
 
diff --git a/lib/src/sats_chip.rs b/lib/src/sats_chip.rs
@@ -1,4 +1,4 @@
-// Copyright (c) 2025 rust-cktap contributors
+// Copyright (c) 2025-2026 rust-cktap contributors
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use async_trait::async_trait;
@@ -28,7 +28,7 @@ pub struct SatsChip {
     pub num_backups: Option<usize>,
     pub pubkey: PublicKey,
     pub card_nonce: [u8; 16],
-    pub auth_delay: Option<usize>,
+    pub auth_delay: Option<u8>,
 }
 
 impl Authentication for SatsChip {
@@ -52,11 +52,11 @@ impl Authentication for SatsChip {
         self.card_nonce = new_nonce;
     }
 
-    fn auth_delay(&self) -> &Option<usize> {
+    fn auth_delay(&self) -> &Option<u8> {
         &self.auth_delay
     }
 
-    fn set_auth_delay(&mut self, auth_delay: Option<usize>) {
+    fn set_auth_delay(&mut self, auth_delay: Option<u8>) {
         self.auth_delay = auth_delay;
     }
 
diff --git a/lib/src/shared.rs b/lib/src/shared.rs
@@ -1,4 +1,4 @@
-// Copyright (c) 2025 rust-cktap contributors
+// Copyright (c) 2025-2026 rust-cktap contributors
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use crate::{CardError, CkTapCard, CkTapError, SatsCard, TapSigner};
@@ -76,8 +76,8 @@ pub trait Authentication {
     fn pubkey(&self) -> &PublicKey;
     fn card_nonce(&self) -> &[u8; 16];
     fn set_card_nonce(&mut self, new_nonce: [u8; 16]);
-    fn auth_delay(&self) -> &Option<usize>;
-    fn set_auth_delay(&mut self, auth_delay: Option<usize>);
+    fn auth_delay(&self) -> &Option<u8>;
+    fn set_auth_delay(&mut self, auth_delay: Option<u8>);
     fn transport(&self) -> Arc<dyn CkTransport>;
     fn card_ident(&self) -> String {
         card_pubkey_to_ident(self.pubkey())
@@ -244,7 +244,7 @@ pub trait Read: Authentication {
 
 #[async_trait]
 pub trait Wait: Authentication {
-    async fn wait(&mut self, cvc: Option<String>) -> Result<Option<usize>, CkTapError> {
+    async fn wait(&mut self, cvc: Option<String>) -> Result<Option<u8>, CkTapError> {
         let epubkey_xcvc = cvc.map(|cvc| {
             let (_, epubkey, xcvc) = self.calc_ekeys_xcvc(&cvc, WaitCommand::name());
             (epubkey, xcvc)
diff --git a/lib/src/tap_signer.rs b/lib/src/tap_signer.rs
@@ -1,4 +1,4 @@
-// Copyright (c) 2025 rust-cktap contributors
+// Copyright (c) 2025-2026 rust-cktap contributors
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use crate::apdu::tap_signer::{XpubCommand, XpubResponse};
@@ -38,7 +38,7 @@ pub struct TapSigner {
     pub num_backups: Option<usize>,
     pub pubkey: PublicKey,
     pub card_nonce: [u8; 16],
-    pub auth_delay: Option<usize>,
+    pub auth_delay: Option<u8>,
 }
 
 impl Authentication for TapSigner {
@@ -62,11 +62,11 @@ impl Authentication for TapSigner {
         self.card_nonce = new_nonce;
     }
 
-    fn auth_delay(&self) -> &Option<usize> {
+    fn auth_delay(&self) -> &Option<u8> {
         &self.auth_delay
     }
 
-    fn set_auth_delay(&mut self, auth_delay: Option<usize>) {
+    fn set_auth_delay(&mut self, auth_delay: Option<u8>) {
         self.auth_delay = auth_delay;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2025 rust-cktap contributors`
	`1`	`+// Copyright (c) 2025-2026 rust-cktap contributors`
`2`	`2`	`// SPDX-License-Identifier: MIT OR Apache-2.0`
`3`	`3`
`4`	`4`	`use crate::check_cert;`
`@@ -48,7 +48,7 @@ impl SatsCard {`
`48`	`48`	`addr: card.addr.clone(),`
`49`	`49`	`pubkey,`
`50`	`50`	`card_ident: card.card_ident(),`
`51`		`- auth_delay: card.auth_delay().map(\|d\| d as u8),`
	`51`	`+ auth_delay: card.auth_delay().clone(),`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`