Merge #395: fix installer: wrong detection of hot signer usage.

2cbdf5bb32b711ea6057141c553b74ec810d9f0d fix installer: wrong detection of hot signer usage. (edouard)

Pull request description:

  We did not check that the keys in the primary path were using the hot signer. In the case of a hot signing key only used for the primary path,
  the hot signer was not advertised to the context
  passing to each installer step and was not stored after install.

ACKs for top commit:
  darosior:
    ACK 2cbdf5bb32b711ea6057141c553b74ec810d9f0d

Tree-SHA512: b7d79b798be1ff0e17609b3ada3bb2374ff56be9bfc023cabc0156f63131e90cf89e646cf391399c8b687740f32a6dd6b0b004dd74120cb4dad9dd9560da55da

gui/src/installer/step/descriptor.rs

@@ -357,6 +357,9 @@ impl Step for DefineDescriptor {
                         master_fingerprint,
                         name: spending_key.name.clone(),
                     });
+                    if master_fingerprint == self.signer.fingerprint() {
+                        signer_is_used = true;
+                    }
                 }
                 let xpub = DescriptorMultiXKey {
                     origin: xpub.origin.clone(),
@@ -1274,3 +1277,100 @@ impl From<BackupDescriptor> for Box<dyn Step> {
         Box::new(s)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use iced_native::command::Action;
+    use std::sync::{Arc, Mutex};
+
+    pub struct Sandbox<S: Step> {
+        step: Arc<Mutex<S>>,
+    }
+
+    impl<S: Step + 'static> Sandbox<S> {
+        pub fn new(step: S) -> Self {
+            Self {
+                step: Arc::new(Mutex::new(step)),
+            }
+        }
+
+        pub fn check<F: FnOnce(&mut S)>(&self, check: F) {
+            let mut step = self.step.lock().unwrap();
+            check(&mut step)
+        }
+
+        pub async fn update(&self, message: Message) {
+            let cmd = self.step.lock().unwrap().update(message);
+            for action in cmd.actions() {
+                if let Action::Future(f) = action {
+                    let msg = f.await;
+                    let _cmd = self.step.lock().unwrap().update(msg);
+                }
+            }
+        }
+    }
+
+    #[tokio::test]
+    async fn test_define_descriptor_use_hotkey() {
+        let mut ctx = Context::new(Network::Signet, PathBuf::from_str("/").unwrap());
+        let sandbox: Sandbox<DefineDescriptor> = Sandbox::new(DefineDescriptor::new());
+
+        // Edit primary key
+        sandbox
+            .update(Message::DefineDescriptor(message::DefineDescriptor::Key(
+                false,
+                0,
+                message::DefineKey::Edit,
+            )))
+            .await;
+        sandbox.check(|step| assert!(step.modal.is_some()));
+        sandbox.update(Message::UseHotSigner).await;
+        sandbox
+            .update(Message::DefineDescriptor(
+                message::DefineDescriptor::NameEdited("hot signer key".to_string()),
+            ))
+            .await;
+        sandbox
+            .update(Message::DefineDescriptor(
+                message::DefineDescriptor::ConfirmXpub,
+            ))
+            .await;
+        sandbox.check(|step| assert!(step.modal.is_none()));
+
+        // Edit sequence
+        sandbox
+            .update(Message::DefineDescriptor(
+                message::DefineDescriptor::SequenceEdited("1000".to_string()),
+            ))
+            .await;
+
+        // Edit recovery key
+        sandbox
+            .update(Message::DefineDescriptor(message::DefineDescriptor::Key(
+                true,
+                0,
+                message::DefineKey::Edit,
+            )))
+            .await;
+        sandbox.check(|step| assert!(step.modal.is_some()));
+        sandbox.update(Message::DefineDescriptor(
+            message::DefineDescriptor::XPubEdited("[f5acc2fd/48'/1'/0'/2']tpubDFAqEGNyad35aBCKUAXbQGDjdVhNueno5ZZVEn3sQbW5ci457gLR7HyTmHBg93oourBssgUxuWz1jX5uhc1qaqFo9VsybY1J5FuedLfm4dK".to_string()),
+        )).await;
+        sandbox
+            .update(Message::DefineDescriptor(
+                message::DefineDescriptor::NameEdited("external recovery key".to_string()),
+            ))
+            .await;
+        sandbox
+            .update(Message::DefineDescriptor(
+                message::DefineDescriptor::ConfirmXpub,
+            ))
+            .await;
+        sandbox.check(|step| {
+            assert!(step.modal.is_none());
+            assert!((step).apply(&mut ctx));
+            assert!(ctx.signer.is_some());
+        });
+    }
+}