feat: add 'xpub' command to cli

Author: notmandatory

cli/src/main.rs

@@ -114,6 +114,12 @@ enum TapSignerCommand {
     Wait,
     /// Get the card's nfc URL
     Nfc,
+    /// Read the xpub (requires CVC)
+    Xpub {
+        /// Give master (`m`) XPUB, otherwise derived XPUB
+        #[clap(short, long)]
+        master: bool,
+    },
 }
 
 /// TapSigner CLI
@@ -150,6 +156,12 @@ enum SatsChipCommand {
     Wait,
     /// Get the card's nfc URL
     Nfc,
+    /// Read the xpub (requires CVC)
+    Xpub {
+        /// Give master (`m`) XPUB, otherwise derived XPUB
+        #[clap(short, long)]
+        master: bool,
+    },
 }
 
 #[tokio::main]
@@ -238,6 +250,7 @@ async fn main() -> Result<(), CliError> {
                 }
                 TapSignerCommand::Wait => wait(ts).await,
                 TapSignerCommand::Nfc => nfc(ts).await,
+                TapSignerCommand::Xpub { master } => xpub(ts, master).await,
             }
         }
         CkTapCard::SatsChip(sc) => {
@@ -270,6 +283,7 @@ async fn main() -> Result<(), CliError> {
                 }
                 SatsChipCommand::Wait => wait(sc).await,
                 SatsChipCommand::Nfc => nfc(sc).await,
+                SatsChipCommand::Xpub { master } => xpub(sc, master).await,
             }
         }
     }
@@ -336,3 +350,13 @@ where
     let nfc = card.nfc().await.expect("nfc failed");
     println!("{nfc}");
 }
+
+async fn xpub<C>(card: &mut C, master: bool)
+where
+    C: TapSignerShared + Send,
+{
+    dbg!(master);
+    let xpub = card.xpub(master, &cvc()).await.expect("xpub failed");
+    dbg!(&xpub);
+    println!("{}", xpub.to_string());
+}

lib/src/tap_signer.rs

@@ -316,7 +316,7 @@ pub trait TapSignerShared: Authentication {
         Ok(())
     }
 
-    async fn xpub(&mut self, cvc: &str, master: bool) -> Result<Xpub, XpubError> {
+    async fn xpub(&mut self, master: bool, cvc: &str) -> Result<Xpub, XpubError> {
         let (_, epubkey, xcvc) = self.calc_ekeys_xcvc(cvc, XpubCommand::name());
         let xpub_command = XpubCommand::new(master, epubkey, xcvc);
         let xpub_response: XpubResponse = transmit(self.transport(), &xpub_command).await?;
@@ -420,9 +420,9 @@ mod test {
         let emulator = find_emulator(pipe_path).await.unwrap();
         if let CkTapCard::TapSigner(mut ts) = emulator {
             ts.init(rand_chaincode(), "123456").await.unwrap();
-            let xpub = ts.xpub("123456", false).await.unwrap();
+            let xpub = ts.xpub(false, "123456").await.unwrap();
             assert_eq!(xpub.depth, 3);
-            let master_xpub = ts.xpub("123456", true).await.unwrap();
+            let master_xpub = ts.xpub(true, "123456").await.unwrap();
             assert_eq!(master_xpub.depth, 0);
         }
         drop(python);